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

Merge "UsbDeviceManager: Modify default function handling" into mnc-dev

Browse Source
This commit is contained in:
Nick Kralevich
2015-06-13 03:12:46 +00:00
committed by Android (Google) Code Review
parent 1035833fc6 43965fe5ce
commit 31b9c1721f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -352,7 +352,7 @@ public class UsbDeviceManager {
SystemProperties.get(UsbManager.ADB_PERSISTENT_PROPERTY, "adb"),
UsbManager.USB_FUNCTION_ADB);
mCurrentFunctions = mAdbEnabled ? "adb" : UsbManager.USB_FUNCTION_MTP;
mCurrentFunctions = getDefaultFunctions();
String state = FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim();
updateState(state);
@@ -474,7 +474,7 @@ public class UsbDeviceManager {
if (DEBUG) Slog.d(TAG, "setEnabledFunctions " + functions);
if (functions == null) {
functions = "none";
functions = getDefaultFunctions();
}
if (mAdbEnabled) {
@@ -795,7 +795,7 @@ public class UsbDeviceManager {
}
private String getDefaultFunctions() {
return UsbManager.USB_FUNCTION_MTP;
return mAdbEnabled ? UsbManager.USB_FUNCTION_ADB : UsbManager.USB_FUNCTION_MTP;
}
public void dump(FileDescriptor fd, PrintWriter pw) {