diff options
| author | Nick Kralevich <nnk@google.com> | 2015-03-26 00:33:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-26 00:33:27 +0000 |
| commit | 005e9b81953a355abcff628cf21e251dcc0e3121 (patch) | |
| tree | 3ba91cb2bf36027d9cfca28b6af05b91ec88f2f9 /services/usb | |
| parent | 1c6bfd69442e91458bb5c10490d0cff579f47e06 (diff) | |
| parent | ad8fc70c6a85e163c16f6531e4872d95a95ddb2f (diff) | |
| download | frameworks_base-005e9b81953a355abcff628cf21e251dcc0e3121.zip frameworks_base-005e9b81953a355abcff628cf21e251dcc0e3121.tar.gz frameworks_base-005e9b81953a355abcff628cf21e251dcc0e3121.tar.bz2 | |
Merge "UsbDeviceManager: delete obsolete code"
Diffstat (limited to 'services/usb')
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 12 |
1 files changed, 0 insertions, 12 deletions
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 @@ public class UsbDeviceManager { 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), |