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

Commit 883c2a4b authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan
Browse files

Only re-enable contaminant detection when port is present 

Contaminant detection is re-enabled when the disconnected port's
portStatus has contaminant detection disabled. During port removal,
there is no reason why contamiant detection has to re-enabled since
the port is anyways being teared down.

Bug: 129696344
Test: dumpsys usb add-port "matrix" ufp;
dumpsys usb remove-port "matrix" ufp

Change-Id: Ie146db82d93414e90ee99b4d17ec0ba5ada2ce83
parent ae9f6953

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);

    }