Merge "Respect Accessory timeout value when restoring defaults" am: 3ddf22e69c

am: c37036d164 Change-Id: Id6feac7351a4627c0a4a90b67899ee2c1aa469e8
2017-11-03 22:32:26 +00:00
parent e9cbcf42ad c37036d164
commit 79a2d2a936
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
@@ -892,7 +892,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);
                        }