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

Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev

Browse Source
This commit is contained in:
Nick Kralevich
2015-07-22 21:18:59 +00:00
committed by Android (Google) Code Review
parent db2b4ba69d b210026e3d
commit 3b0bbd7b96
1 changed files with 1 additions and 4 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,10 +49,8 @@ import com.android.internal.util.IndentingPrintWriter;
import com.android.server.FgThread; import com.android.server.FgThread;
import java.io.File; import java.io.File;
import java.io.FileDescriptor;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@@ -807,8 +805,7 @@ public class UsbDeviceManager {
} }
private String getDefaultFunctions() { private String getDefaultFunctions() {
return SystemProperties.get(USB_PERSISTENT_CONFIG_PROPERTY, return mAdbEnabled ? UsbManager.USB_FUNCTION_ADB : UsbManager.USB_FUNCTION_MTP;
UsbManager.USB_FUNCTION_ADB);
} }
public void dump(IndentingPrintWriter pw) { public void dump(IndentingPrintWriter pw) {