Merge "Exit accessory mode more aggressively" (1e87ae5c) · Commits · e / os / android_frameworks_base

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

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -606,8 +606,12 @@ public class UsbDeviceManager {
	} else {		} else {
	Slog.e(TAG, "nativeGetAccessoryStrings failed");		Slog.e(TAG, "nativeGetAccessoryStrings failed");
	}		}
	} else if (!mConnected && !enteringAccessoryMode) {		} else {
			if (!enteringAccessoryMode) {
	notifyAccessoryModeExit();		notifyAccessoryModeExit();
			} else if (DEBUG) {
			Slog.v(TAG, "Debouncing accessory mode exit");
			}
	}		}
	}		}

	@@ -813,6 +817,9 @@ public class UsbDeviceManager {
	break;		break;
	}		}
	case MSG_ACCESSORY_MODE_ENTER_TIMEOUT: {		case MSG_ACCESSORY_MODE_ENTER_TIMEOUT: {
			if (DEBUG) {
			Slog.v(TAG, "Accessory mode enter timeout: " + mConnected);
			}
	if (!mConnected) {		if (!mConnected) {
	notifyAccessoryModeExit();		notifyAccessoryModeExit();
	}		}