commit 0d767e6f098cf4348a7ca8694b673eec0336a3e8
author Nick Kralevich <nnk@google.com> Thu Jul 23 01:43:23 2015 +0000
committer Nick Kralevich <nnk@google.com> Thu Jul 23 01:45:01 2015 +0000
tree ddf334ddb4cc1b1c97bbfddcb9c954f36942d695
parent b210026e3d5c955628ca8b8b9191ade08891e9ef

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

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