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

am 06b93a48: Merge "Revert "UsbDeviceManager: fix b/21429947 regression"" into mnc-dev

Browse Source 
* commit '06b93a48ad0d2274ff41683e08b8a1429045b0a9':
  Revert "UsbDeviceManager: fix b/21429947 regression"
This commit is contained in:
Nick Kralevich
2015-07-23 19:20:05 +00:00
committed by Android Git Automerger
parent 5974a7ea2f 06b93a48ad
commit a2adb4c544
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) {