Merge "usb: Don't show the notification when no USB device is connected" (e648d3cb) · Commits · e / os / android_frameworks_base

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

+20 −1

Original line number	Diff line number	Diff line
		@@ -508,6 +508,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
		// current USB state
		private boolean mHostConnected;
		private boolean mUsbAccessoryConnected;
		private boolean mInHostModeWithNoAccessoryConnected;
		private boolean mSourcePower;
		private boolean mSinkPower;
		private boolean mConfigured;
		@@ -959,6 +960,17 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
		mSupportsAllCombinations = false;
		}

		if (mHostConnected) {
		if (!mUsbAccessoryConnected) {
		mInHostModeWithNoAccessoryConnected = true;
		} else {
		mInHostModeWithNoAccessoryConnected = false;
		}
		} else {
		// if not in host mode, reset value to false
		mInHostModeWithNoAccessoryConnected = false;
		}

		mAudioAccessorySupported = port.isModeSupported(MODE_AUDIO_ACCESSORY);

		args.recycle();
		@@ -983,6 +995,12 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
		Slog.i(TAG, "HOST_STATE connected:" + mUsbAccessoryConnected);
		}

		if (!devices.hasNext()) {
		mInHostModeWithNoAccessoryConnected = true;
		} else {
		mInHostModeWithNoAccessoryConnected = false;
		}

		mHideUsbNotification = false;
		while (devices.hasNext()) {
		Map.Entry pair = (Map.Entry) devices.next();
		@@ -1192,7 +1210,8 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser

		// Dont show the notification when connected to a USB peripheral
		// and the link does not support PR_SWAP and DR_SWAP
		if (mHideUsbNotification && !mSupportsAllCombinations) {
		if ((mHideUsbNotification \|\| mInHostModeWithNoAccessoryConnected)
		&& !mSupportsAllCombinations) {
		if (mUsbNotificationId != 0) {
		mNotificationManager.cancelAsUser(null, mUsbNotificationId,
		UserHandle.ALL);