Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da1db85d authored by Shashank Mittal's avatar Shashank Mittal Committed by Ricardo Cerqueira
Browse files

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
parent 52d943c6

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

+4 −2
Original line number Diff line number Diff line
@@ -475,7 +475,8 @@ public class UsbDeviceManager { 
            // 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 @@ public class UsbDeviceManager { 
                // 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);