am 202ab298: am c5ec9fed: am 3bde026a: am afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev

* commit '202ab2986c2ab61ea32845ea94af6e329c1fd83c':
  DO NOT MERGE: Don't log passwords returned from vdc
This commit is contained in:
Paul Lawrence
2014-11-07 00:06:25 +00:00
committed by Android Git Automerger

View File

@@ -176,7 +176,6 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
if (buffer[i] == 0) { if (buffer[i] == 0) {
final String rawEvent = new String( final String rawEvent = new String(
buffer, start, i - start, StandardCharsets.UTF_8); buffer, start, i - start, StandardCharsets.UTF_8);
log("RCV <- {" + rawEvent + "}");
boolean releaseWl = false; boolean releaseWl = false;
try { try {
@@ -197,7 +196,6 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
mResponseQueue.add(event.getCmdNumber(), event); mResponseQueue.add(event.getCmdNumber(), event);
} }
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
log("Problem parsing message: " + rawEvent + " - " + e);
} finally { } finally {
if (releaseWl) { if (releaseWl) {
mWakeLock.acquire(); mWakeLock.acquire();
@@ -209,7 +207,6 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
} }
if (start == 0) { if (start == 0) {
final String rawEvent = new String(buffer, start, count, StandardCharsets.UTF_8); final String rawEvent = new String(buffer, start, count, StandardCharsets.UTF_8);
log("RCV incomplete <- {" + rawEvent + "}");
} }
// We should end at the amount we read. If not, compact then // We should end at the amount we read. If not, compact then