commit 005e9b81953a355abcff628cf21e251dcc0e3121
author Nick Kralevich <nnk@google.com> Thu Mar 26 00:33:26 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 26 00:33:27 2015 +0000
tree 3ba91cb2bf36027d9cfca28b6af05b91ec88f2f9
parent 1c6bfd69442e91458bb5c10490d0cff579f47e06
parent ad8fc70c6a85e163c16f6531e4872d95a95ddb2f

Merge "UsbDeviceManager: delete obsolete code"

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

diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index fe002a0..6adb8be 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -365,18 +365,6 @@
                 updateState(state);
                 mAdbEnabled = containsFunction(mCurrentFunctions, UsbManager.USB_FUNCTION_ADB);
 
-                // Upgrade step for previous versions that used persist.service.adb.enable
-                String value = SystemProperties.get("persist.service.adb.enable", "");
-                if (value.length() > 0) {
-                    char enable = value.charAt(0);
-                    if (enable == '1') {
-                        setAdbEnabled(true);
-                    } else if (enable == '0') {
-                        setAdbEnabled(false);
-                    }
-                    SystemProperties.set("persist.service.adb.enable", "");
-                }
-
                 // register observer to listen for settings changes
                 mContentResolver.registerContentObserver(
                         Settings.Global.getUriFor(Settings.Global.ADB_ENABLED),