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

Commit 92a948e4 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 am: c37036d1 

am: 79a2d2a9

Change-Id: I5d315bf170184c65d2713c4be55170bab1eb42f6
parents 680130d1 79a2d2a9

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

+1 −1
Original line number Diff line number Diff line
@@ -893,7 +893,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);

                        }