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

Commit 14f22174 authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by Android (Google) Code Review
Browse files

Merge "Only re-enable contaminant detection when port is present"

parents 3acdae62 883c2a4b

services/usb/java/com/android/server/usb/UsbPortManager.java

+1 −1
Original line number Diff line number Diff line
@@ -965,7 +965,6 @@ public class UsbPortManager { 


    private void handlePortLocked(PortInfo portInfo, IndentingPrintWriter pw) {

        sendPortChangedBroadcastLocked(portInfo);

        enableContaminantDetectionIfNeeded(portInfo, pw);

        logToStatsd(portInfo, pw);

        updateContaminantNotification();

    }
@@ -977,6 +976,7 @@ public class UsbPortManager { 


    private void handlePortChangedLocked(PortInfo portInfo, IndentingPrintWriter pw) {

        logAndPrint(Log.INFO, pw, "USB port changed: " + portInfo);

        enableContaminantDetectionIfNeeded(portInfo, pw);

        handlePortLocked(portInfo, pw);

    }