commit 820bf084ec4221cc77fab0038ecfeffc795eb02b
author Shashank Mittal <mittals@codeaurora.org> Thu Jul 31 15:32:29 2014 -0700
committer Linux Build Service Account <lnxbuild@localhost> Tue Nov 04 08:34:09 2014 -0700
tree 47378efcb551f68943cfc7db777ce98cce15e24a
parent ea6f452bb0fe28bf0576b311a0c9c971b93d2093

USB: Don't add adb function when usb disconnected

When USB is disconnected, "adb" functions will be added even in
"charging" mode. This breaks "charging" mode's design.

Change-Id: I7ab62194a0acb97620e33da4839e0f6c87f60917

services/usb/java/com/android/server/usb/UsbDeviceManager.java

diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index 04fd0cc..93b25ea 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -475,7 +475,8 @@
             // with OEM specific mode.
             if (functions != null && makeDefault && !needsOemUsbOverride()) {
 
-                if (mAdbEnabled) {
+                if (!UsbManager.USB_FUNCTION_CHARGING.equals(functions)
+                        && mAdbEnabled) {
                     functions = addFunction(functions, UsbManager.USB_FUNCTION_ADB);
                 } else {
                     functions = removeFunction(functions, UsbManager.USB_FUNCTION_ADB);
@@ -507,7 +508,8 @@
                 // Override with bootmode specific usb mode if needed
                 functions = processOemUsbOverride(functions);
 
-                if (mAdbEnabled) {
+                if (!UsbManager.USB_FUNCTION_CHARGING.equals(functions)
+                        && mAdbEnabled) {
                     functions = addFunction(functions, UsbManager.USB_FUNCTION_ADB);
                 } else {
                     functions = removeFunction(functions, UsbManager.USB_FUNCTION_ADB);