diff options
| author | Nick Kralevich <nnk@google.com> | 2015-07-23 01:46:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-23 01:46:38 +0000 |
| commit | 06b93a48ad0d2274ff41683e08b8a1429045b0a9 (patch) | |
| tree | e7bce1c9ce434e89c52581faf6e09720d4f105db /services/usb | |
| parent | 492fc6483184a0e82d5d1a77634a38c10c7577ac (diff) | |
| parent | 0d767e6f098cf4348a7ca8694b673eec0336a3e8 (diff) | |
| download | frameworks_base-06b93a48ad0d2274ff41683e08b8a1429045b0a9.zip frameworks_base-06b93a48ad0d2274ff41683e08b8a1429045b0a9.tar.gz frameworks_base-06b93a48ad0d2274ff41683e08b8a1429045b0a9.tar.bz2 | |
Merge "Revert "UsbDeviceManager: fix b/21429947 regression"" into mnc-dev
Diffstat (limited to 'services/usb')
| -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) { |