Merge "Regional: Fix usb connection bug" (e62f8f33) · Commits · e / os / android_frameworks_base

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -752,7 +752,7 @@ public class UsbDeviceManager {
		//}
		}
		}
		if (id != mUsbNotificationId && mBootCompleted) {
		if (id != mUsbNotificationId) {
		// clear notification if title needs changing
		if (mUsbNotificationId != 0) {
		mNotificationManager.cancelAsUser(null, mUsbNotificationId,
		@@ -786,12 +786,16 @@ public class UsbDeviceManager {
		mNotificationManager.notifyAsUser(null, id, notification,
		UserHandle.ALL);
		mUsbNotificationId = id;
		}
		}
		if (r.getBoolean(com.android.internal.R.bool.
		always_popup_usb_computer_connection_option))
		always_popup_usb_computer_connection_option) && mBootCompleted) {
		Intent intent = Intent.makeRestartActivityTask(
		new ComponentName("com.android.settings",
		"com.android.settings.UsbSettings"));
		mContext.startActivity(intent);
		}
		}
		}

		private void updateAdbNotification() {
		if (mNotificationManager == null) return;