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

Commit a45dac0e authored by Jerry Zhang's avatar Jerry Zhang
Browse files

Clean up persistent usb state on boot. 

b/31814300 was fixed, but mtp can still stick around in the
persistent config even after flashing. This block of code
will only run once, but will ensure that mtp is not in
the config after the update.

Bug: 31814300
Test: Manual
Change-Id: Icf02be38c9e1f769412ac963ed6afc14e6092bfb
parent 047f5a7b

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

+11 −5
Original line number Diff line number Diff line
@@ -352,6 +352,16 @@ public class UsbDeviceManager { 
                mAdbEnabled = UsbManager.containsFunction(getDefaultFunctions(),

                        UsbManager.USB_FUNCTION_ADB);



                /**

                 * Remove MTP from persistent config, to bring usb to a good state

                 * after fixes to b/31814300. This block can be removed after the update

                 */

                String persisted = SystemProperties.get(USB_PERSISTENT_CONFIG_PROPERTY);

                if (UsbManager.containsFunction(persisted, UsbManager.USB_FUNCTION_MTP)) {

                    SystemProperties.set(USB_PERSISTENT_CONFIG_PROPERTY,

                            UsbManager.removeFunction(persisted, UsbManager.USB_FUNCTION_MTP));

                }



                String buildType = SystemProperties.get(BUILD_TYPE_PROPERTY);

                if (buildType.equals(BUILD_TYPE_USERDEBUG) || buildType.equals(BUILD_TYPE_ENG)) {

                    setAdbEnabled(true);
@@ -472,17 +482,13 @@ public class UsbDeviceManager { 
                            USB_PERSISTENT_CONFIG_PROPERTY, UsbManager.USB_FUNCTION_NONE));

                SystemProperties.set(USB_PERSISTENT_CONFIG_PROPERTY, newFunction);



                // Changing the persistent config also changes the normal

                // config. Wait for this to happen before changing again.

                waitForState(newFunction);



                // Remove mtp from the config if file transfer is not enabled

                if (oldFunctions.equals(UsbManager.USB_FUNCTION_MTP) && 

                        !mUsbDataUnlocked && enable) {

                    oldFunctions = UsbManager.USB_FUNCTION_NONE;

                }



                setEnabledFunctions(oldFunctions, false, mUsbDataUnlocked);

                setEnabledFunctions(oldFunctions, true, mUsbDataUnlocked);

                updateAdbNotification();

            }