nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am c8a1ec6e: Merge "[TestPrep2] Rename a method" 

* commit 'c8a1ec6e4128240a8f666120dbc3fb066a717f00':
  [TestPrep2] Rename a method
main
Kurt Partridge 2013-02-21 14:15:35 -08:00 committed by Android Git Automerger
parent be28c0c0b5 c8a1ec6e41
commit 14ff187c39
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/com/android/inputmethod/research/LogUnit.java
View File

@ -151,10 +151,10 @@ import java.util.List;
continue;
}
// Only retrieve the jsonWriter if we need to. If we don't get this far, then
// researchLog.getValidJsonWriterLocked() will not ever be called, and the file
// will not have been opened for writing.
// researchLog.getInitializedJsonWriterLocked() will not ever be called, and the
// file will not have been opened for writing.
if (jsonWriter == null) {
jsonWriter = researchLog.getValidJsonWriterLocked();
jsonWriter = researchLog.getInitializedJsonWriterLocked();
outputLogUnitStart(jsonWriter, canIncludePrivateData);
}
logStatement.outputToLocked(jsonWriter, mTimeList.get(i), mValuesList.get(i));

2
java/src/com/android/inputmethod/research/ResearchLog.java
View File

@ -206,7 +206,7 @@ public class ResearchLog {
* Return a JsonWriter for this ResearchLog. It is initialized the first time this method is
* called. The cached value is returned in future calls.
*/
public JsonWriter getValidJsonWriterLocked() {
public JsonWriter getInitializedJsonWriterLocked() {
try {
if (mJsonWriter == NULL_JSON_WRITER && mFile != null) {
final FileOutputStream fos =