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

Commit a14d7825 authored by Paul Lawrence's avatar Paul Lawrence Committed by The Android Automerger
Browse files

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

Turns off logging of responses from native daemon connector altogether.
Proper solution to follow in LMP MR1

Bug: 18260068
Change-Id: I25bc9cb61049a3efdd9a9cd11195864a04ef05fd
parent b2ef7bfe

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

+0 −3
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ 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 {
@@ -197,7 +196,6 @@ 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();
@@ -209,7 +207,6 @@ 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