commit 7bdcbd8bfc7716a323a09a6439b6636fa124a61a
author Nick Kralevich <nnk@google.com> Fri Jul 24 05:11:28 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 24 05:11:28 2015 +0000
tree 583b6f0ff71dfddd53d39d10e8ffa4c4376ffebd
parent 26ed7e6dfacf51ca4cfc727d5373b11a127d3b57
parent a508d399e720b3a535832ce0b2554680197944af

am a508d399: am 01e00c8c: am e4f10de7: am dd856a3f: am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev

* commit 'a508d399e720b3a535832ce0b2554680197944af':
  UsbDeviceManager: fix b/21429947 regression

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 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.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 @@
         }
 
         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) {