Merge "Always reevaluate whether to show the notification for USB_DEVICE_* intents" into oc-dr1-dev (d5f442d6) · Commits · e / os / android_frameworks_base

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

+16 −9

Original line number	Diff line number	Diff line
		@@ -956,11 +956,6 @@ public class UsbDeviceManager {
		Slog.i(TAG, "HOST_STATE connected:" + connected);
		}

		if ((mHideUsbNotification && connected)
		\|\| (!mHideUsbNotification && !connected)) {
		break;
		}

		mHideUsbNotification = false;
		while (devices.hasNext()) {
		Map.Entry pair = (Map.Entry) devices.next();
		@@ -1061,12 +1056,22 @@ public class UsbDeviceManager {

		private void updateUsbNotification(boolean force) {
		if (mNotificationManager == null \|\| !mUseUsbNotification
		\|\| ("0".equals(SystemProperties.get("persist.charging.notify")))
		\|\| ("0".equals(SystemProperties.get("persist.charging.notify")))) {
		return;
		}

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

		int id = 0;
		int titleRes = 0;
		Resources r = mContext.getResources();
		@@ -1117,6 +1122,7 @@ public class UsbDeviceManager {
		if (mUsbNotificationId != 0) {
		mNotificationManager.cancelAsUser(null, mUsbNotificationId,
		UserHandle.ALL);
		Slog.d(TAG, "Clear notification");
		mUsbNotificationId = 0;
		}
		if (id != 0) {
		@@ -1173,6 +1179,7 @@ public class UsbDeviceManager {

		mNotificationManager.notifyAsUser(null, id, notification,
		UserHandle.ALL);
		Slog.d(TAG, "push notification:" + title);
		mUsbNotificationId = id;
		}
		}