From d66f3e584ba9e5c9b104b111305edceedd23fcb0 Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Tue, 11 Nov 2014 17:28:28 +0000 Subject: [PATCH] Revert "DO NOT MERGE: Don't log passwords returned from vdc" This reverts commit 70c9a06af0028cb0d0d8d36af7ff040a1a4e331c. The original change disabled all logging of RCVed messages in NativeDaemonConnector. For MR1 we want a much more surgical disabling of sensitive messages. First, though, we have to defeat the automerger. Change-Id: I712919aee2db63f7fc0b2c6d6a2a658325dce596 --- .../core/java/com/android/server/NativeDaemonConnector.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/NativeDaemonConnector.java b/services/core/java/com/android/server/NativeDaemonConnector.java index 8c3b020f57d30..96f9ab061c106 100644 --- a/services/core/java/com/android/server/NativeDaemonConnector.java +++ b/services/core/java/com/android/server/NativeDaemonConnector.java @@ -176,6 +176,7 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo if (buffer[i] == 0) { final String rawEvent = new String( buffer, start, i - start, StandardCharsets.UTF_8); + log("RCV <- {" + rawEvent + "}"); boolean releaseWl = false; try { @@ -196,6 +197,7 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo mResponseQueue.add(event.getCmdNumber(), event); } } catch (IllegalArgumentException e) { + log("Problem parsing message: " + rawEvent + " - " + e); } finally { if (releaseWl) { mWakeLock.acquire(); @@ -207,6 +209,7 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo } if (start == 0) { 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