Revert "DO NOT MERGE: Don't log passwords returned from vdc"
This reverts commit 201c2f73b61c220cd26c2f132522fd679c726ae4.
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
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 @@
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 @@
mResponseQueue.add(event.getCmdNumber(), event);
}
} catch (IllegalArgumentException e) {
+ log("Problem parsing message: " + rawEvent + " - " + e);
} finally {
if (releaseWl) {
mWakeLock.acquire();
@@ -207,6 +209,7 @@
}
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