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

Commit 4daf9b1b authored by Benoit Goby's avatar Benoit Goby Committed by Android (Google) Code Review
Browse files

Merge "UsbDeviceManager: Don't start UsbDebuggingManager when data is encrypted"

parents 5988335a 78a9687f

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

+3 −1
Original line number Diff line number Diff line
@@ -169,7 +169,9 @@ public class UsbDeviceManager { 
            startAccessoryMode();

        }



        if ("1".equals(SystemProperties.get("ro.adb.secure"))) {

        boolean secureAdbEnabled = SystemProperties.getBoolean("ro.adb.secure", false);

        boolean dataEncrypted = "1".equals(SystemProperties.get("vold.decrypt"));

        if (secureAdbEnabled && !dataEncrypted) {

            mDebuggingManager = new UsbDebuggingManager(context);

        }

    }