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

Commit c37036d1 authored by Selim Gurun's avatar Selim Gurun Committed by android-build-merger
Browse files

Merge "Respect Accessory timeout value when restoring defaults" 

am: 3ddf22e6

Change-Id: I3ee7b72ac335902ce2f9322f0dbedd48429dc663
parents c5d5be72 3ddf22e6

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

+1 −1
Original line number Diff line number Diff line
@@ -902,7 +902,7 @@ public class UsbDeviceManager { 
                        updateCurrentAccessory();

                    }

                    if (mBootCompleted) {

                        if (!mConnected) {

                        if (!mConnected && !hasMessages(MSG_ACCESSORY_MODE_ENTER_TIMEOUT)) {

                            // restore defaults when USB is disconnected

                            setEnabledFunctions(null, !mAdbEnabled, false);

                        }