Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "UsbDeviceManager: fix b/21429947 regression"

Browse Source 
This causes various problems with our testing infrastructure.

This reverts commit b210026e3d.

Bug: 22447614
Bug: 21429947
Change-Id: I57623e3d993e65b6ad89e7a7d28e9575cf638994
This commit is contained in:
Nick Kralevich
2015-07-23 01:43:23 +00:00
parent b210026e3d
commit 0d767e6f09
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

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