Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d66f3e58 authored by Paul Lawrence's avatar Paul Lawrence
Browse files

Revert "DO NOT MERGE: Don't log passwords returned from vdc" 

This reverts commit 70c9a06a.

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
parent 4dfce43e

services/core/java/com/android/server/NativeDaemonConnector.java

+3 −0
Original line number Diff line number Diff line
@@ -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