diff options
| author | Nick Kralevich <nnk@google.com> | 2015-07-23 01:43:23 +0000 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2015-07-23 01:45:01 +0000 |
| commit | 0d767e6f098cf4348a7ca8694b673eec0336a3e8 (patch) | |
| tree | ddf334ddb4cc1b1c97bbfddcb9c954f36942d695 /services/usb/java/com | |
| parent | b210026e3d5c955628ca8b8b9191ade08891e9ef (diff) | |
| download | frameworks_base-0d767e6f098cf4348a7ca8694b673eec0336a3e8.zip frameworks_base-0d767e6f098cf4348a7ca8694b673eec0336a3e8.tar.gz frameworks_base-0d767e6f098cf4348a7ca8694b673eec0336a3e8.tar.bz2 | |
Revert "UsbDeviceManager: fix b/21429947 regression"
This causes various problems with our testing infrastructure.
This reverts commit b210026e3d5c955628ca8b8b9191ade08891e9ef.
Bug: 22447614
Bug: 21429947
Change-Id: I57623e3d993e65b6ad89e7a7d28e9575cf638994
Diffstat (limited to 'services/usb/java/com')
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 4cfa37a..1787b91 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -49,8 +49,10 @@ import com.android.internal.util.IndentingPrintWriter; import com.android.server.FgThread; import java.io.File; +import java.io.FileDescriptor; import java.io.FileNotFoundException; import java.io.IOException; +import java.io.PrintWriter; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -805,7 +807,8 @@ public class UsbDeviceManager { } private String getDefaultFunctions() { - return mAdbEnabled ? UsbManager.USB_FUNCTION_ADB : UsbManager.USB_FUNCTION_MTP; + return SystemProperties.get(USB_PERSISTENT_CONFIG_PROPERTY, + UsbManager.USB_FUNCTION_ADB); } public void dump(IndentingPrintWriter pw) { |