diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-11-11 17:28:28 +0000 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2014-11-24 10:40:15 -0800 |
| commit | d66f3e584ba9e5c9b104b111305edceedd23fcb0 (patch) | |
| tree | 6cdc517679087f0025d7bc7f076d8dab270543f1 /services/core/java/com/android/server/NativeDaemonConnector.java | |
| parent | 4dfce43e976a294b3b575564c855214a8e5cef58 (diff) | |
| download | frameworks_base-d66f3e584ba9e5c9b104b111305edceedd23fcb0.zip frameworks_base-d66f3e584ba9e5c9b104b111305edceedd23fcb0.tar.gz frameworks_base-d66f3e584ba9e5c9b104b111305edceedd23fcb0.tar.bz2 | |
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
Diffstat (limited to 'services/core/java/com/android/server/NativeDaemonConnector.java')
| -rw-r--r-- | services/core/java/com/android/server/NativeDaemonConnector.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/NativeDaemonConnector.java b/services/core/java/com/android/server/NativeDaemonConnector.java index 8c3b020..96f9ab0 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 |