Skip to content
Snippets Groups Projects
Commit 60f565ca authored by Kurt Partridge's avatar Kurt Partridge Committed by Android Git Automerger
Browse files

am 7faa2caa: Merge "[Lazy4] Remove useless debug code"

* commit '7faa2caa':
  [Lazy4] Remove useless debug code
parents ba948737 7faa2caa
No related branches found
No related tags found
No related merge requests found
...@@ -119,22 +119,6 @@ public class LogUnit { ...@@ -119,22 +119,6 @@ public class LogUnit {
*/ */
public synchronized void publishTo(final ResearchLog researchLog, public synchronized void publishTo(final ResearchLog researchLog,
final boolean canIncludePrivateData) { final boolean canIncludePrivateData) {
// Prepare debugging output if necessary
final StringWriter debugStringWriter;
final JsonWriter debugJsonWriter;
if (DEBUG) {
debugStringWriter = new StringWriter();
debugJsonWriter = new JsonWriter(debugStringWriter);
debugJsonWriter.setIndent(" ");
try {
debugJsonWriter.beginArray();
} catch (IOException e) {
Log.e(TAG, "Could not open array in JsonWriter", e);
}
} else {
debugStringWriter = null;
debugJsonWriter = null;
}
// Write out any logStatement that passes the privacy filter. // Write out any logStatement that passes the privacy filter.
final int size = mLogStatementList.size(); final int size = mLogStatementList.size();
if (size != 0) { if (size != 0) {
...@@ -157,29 +141,12 @@ public class LogUnit { ...@@ -157,29 +141,12 @@ public class LogUnit {
outputLogUnitStart(jsonWriter, canIncludePrivateData); outputLogUnitStart(jsonWriter, canIncludePrivateData);
} }
logStatement.outputToLocked(jsonWriter, mTimeList.get(i), mValuesList.get(i)); logStatement.outputToLocked(jsonWriter, mTimeList.get(i), mValuesList.get(i));
if (DEBUG) {
logStatement.outputToLocked(debugJsonWriter, mTimeList.get(i),
mValuesList.get(i));
}
} }
if (jsonWriter != null) { if (jsonWriter != null) {
// We must have called logUnitStart earlier, so emit a logUnitStop. // We must have called logUnitStart earlier, so emit a logUnitStop.
outputLogUnitStop(jsonWriter); outputLogUnitStop(jsonWriter);
} }
} }
if (DEBUG) {
try {
debugJsonWriter.endArray();
debugJsonWriter.flush();
} catch (IOException e) {
Log.e(TAG, "Could not close array in JsonWriter", e);
}
final String bigString = debugStringWriter.getBuffer().toString();
final String[] lines = bigString.split("\n");
for (String line : lines) {
Log.d(TAG, line);
}
}
} }
private static final String WORD_KEY = "_wo"; private static final String WORD_KEY = "_wo";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment