From 43965fe5cecd2bc8e139f4cbd012e5d6407ac7f6 Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Fri, 12 Jun 2015 17:19:12 -0700 Subject: UsbDeviceManager: Modify default function handling When adb is enabled, there's no need to also enable MTP mode. ADB mode enabled is sufficient to get connect messages from the kernel driver. This change modifies getDefaultFunctions() to return adb mode if adb is enabled, but mtp when it's not enabled. Also stop using "none" mode as the default. "none" should only be used when toggling the driver. Bug: 21429947 Change-Id: I767491417c6c69a120fcf4f3d6ec0c73311a1a60 --- services/usb/java/com/android/server/usb/UsbDeviceManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'services/usb') diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 588f8c6..3d610b2 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -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) { -- cgit v1.1