Merge "Respect Accessory timeout value when restoring defaults"

am: 3ddf22e69c Change-Id: I3ee7b72ac335902ce2f9322f0dbedd48429dc663
2017-11-03 22:22:15 +00:00
parent c5d5be72a3 3ddf22e69c
commit c37036d164
1 changed files with 1 additions and 1 deletions
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -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);
                        }