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

Commit e032706d authored by Benoit Goby's avatar Benoit Goby Committed by Android Git Automerger
Browse files

am 4daf9b1b: Merge "UsbDeviceManager: Don\'t start UsbDebuggingManager when data is encrypted" 

# Via Android (Google) Code Review (1) and Benoit Goby (1)
* commit '4daf9b1b':
  UsbDeviceManager: Don't start UsbDebuggingManager when data is encrypted
parents 8dd68d79 4daf9b1b

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

        }

    }