Merge "[TestPrep2] Rename a method"

This commit is contained in:
Kurt Partridge 2013-02-21 15:57:33 +00:00 committed by Android (Google) Code Review
commit c8a1ec6e41
2 changed files with 4 additions and 4 deletions

View file

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

View file

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