Merge "[TestPrep2] Rename a method"
commit
c8a1ec6e41
|
@ -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));
|
||||
|
|
|
@ -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 =
|
||||
|
|
Loading…
Reference in New Issue