Merge "Exit accessory mode more aggressively"

2016-12-14 22:29:35 +00:00
parent 04b2be42c3 4f9e88a4af
commit 1e87ae5c8e
1 changed files with 9 additions and 2 deletions
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -606,8 +606,12 @@ public class UsbDeviceManager {
                } 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 @@ public class UsbDeviceManager {
                    break;
                }
                case MSG_ACCESSORY_MODE_ENTER_TIMEOUT: {
+                    if (DEBUG) {
+                        Slog.v(TAG, "Accessory mode enter timeout: " + mConnected);
+                    }
                    if (!mConnected) {
                        notifyAccessoryModeExit();
                    }