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

Commit 823e805c authored by Tim Kilbourn's avatar Tim Kilbourn
Browse files

Always set the usb config when modifying it. 

On some devices, setting system properties takes too long and we end up
with races where adbd gets killed and never comes back. With this
change we avoid a small optimization that checks the previous value of
the config, instead opting to set it every time.

Bug: 23631400
Change-Id: I7567cc2efb3d5d15c45334bd66b28877a2af0ac3
parent 68055395

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

+3 −4
Original line number Diff line number Diff line
@@ -416,10 +416,9 @@ public class UsbDeviceManager { 
        private boolean setUsbConfig(String config) {

            if (DEBUG) Slog.d(TAG, "setUsbConfig(" + config + ")");

            // set the new configuration

            String oldConfig = SystemProperties.get(USB_CONFIG_PROPERTY);

            if (!config.equals(oldConfig)) {

            // we always set it due to b/23631400, where adbd was getting killed

            // and not restarted due to property timeouts on some devices

            SystemProperties.set(USB_CONFIG_PROPERTY, config);

            }

            return waitForState(config);

        }