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

2013-01-29 02:33:27 +00:00
parent 5988335aac 78a9687fc2
commit 4daf9b1ba5
1 changed files with 3 additions and 1 deletions
--- a/services/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/java/com/android/server/usb/UsbDeviceManager.java
@@ -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);
        }
    }