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

Commit 78a9687f authored by Benoit Goby's avatar Benoit Goby
Browse files

UsbDeviceManager: Don't start UsbDebuggingManager when data is encrypted 

This avoids showing the confirmation dialog from the decryption screen

Bug: 8019508
Change-Id: I7ff364437f6b8aeea26fa8308aa4fe35b7ede5d7
parent b9781fe0

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

        }

    }