diff options
| author | Nick Kralevich <nnk@google.com> | 2015-07-22 21:18:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-22 21:18:59 +0000 |
| commit | 3b0bbd7b96568f0d0121136fcac9d4e1a5ffd237 (patch) | |
| tree | f9042783cd94f524eb2ef41b19b40324b38ec328 /services | |
| parent | db2b4ba69db391c3703277ccb986524c072be5f5 (diff) | |
| parent | b210026e3d5c955628ca8b8b9191ade08891e9ef (diff) | |
| download | frameworks_base-3b0bbd7b96568f0d0121136fcac9d4e1a5ffd237.zip frameworks_base-3b0bbd7b96568f0d0121136fcac9d4e1a5ffd237.tar.gz frameworks_base-3b0bbd7b96568f0d0121136fcac9d4e1a5ffd237.tar.bz2 | |
Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 1787b91..4cfa37a 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -49,10 +49,8 @@ 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; @@ -807,8 +805,7 @@ public class UsbDeviceManager { } private String getDefaultFunctions() { - return SystemProperties.get(USB_PERSISTENT_CONFIG_PROPERTY, - UsbManager.USB_FUNCTION_ADB); + return mAdbEnabled ? UsbManager.USB_FUNCTION_ADB : UsbManager.USB_FUNCTION_MTP; } public void dump(IndentingPrintWriter pw) { |