commit 1e87ae5c8e9d904af15099c778e08ed88eb0aa87
author David Stevens <stevensd@google.com> Wed Dec 14 22:29:35 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 14 22:29:39 2016 +0000
tree 9c3214bc283d9c0ed5d8f24477fb7b9a6c1abcde
parent 04b2be42c38a26b84209103a2ef090500b410459
parent 4f9e88a4afc7eb3e299b8a69c853f89077c86435

Merge "Exit accessory mode more aggressively"

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

diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index 581dbe3..db7a31a 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -606,8 +606,12 @@
                 } else {
                     Slog.e(TAG, "nativeGetAccessoryStrings failed");
                 }
-            } else if (!mConnected && !enteringAccessoryMode) {
-                notifyAccessoryModeExit();
+            } else {
+                if (!enteringAccessoryMode) {
+                    notifyAccessoryModeExit();
+                } else if (DEBUG) {
+                    Slog.v(TAG, "Debouncing accessory mode exit");
+                }
             }
         }
 
@@ -813,6 +817,9 @@
                     break;
                 }
                 case MSG_ACCESSORY_MODE_ENTER_TIMEOUT: {
+                    if (DEBUG) {
+                        Slog.v(TAG, "Accessory mode enter timeout: " + mConnected);
+                    }
                     if (!mConnected) {
                         notifyAccessoryModeExit();
                     }