Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always reevaluate whether to show the notification for USB_DEVICE_* intents" into oc-dr1-dev

Browse Source 
am: d5f442d65b

Change-Id: I00374ea814200a8142e208f9fa2f7b7e2a45f4b0
This commit is contained in:
Badhri Jagan Sridharan
2017-07-19 18:11:25 +00:00
committed by android-build-merger
parent dd415c0734 d5f442d65b
commit 19ad4c2055
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -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")))
// Dont show the notification when connected to a USB peripheral
// and the link does not support PR_SWAP and DR_SWAP
|| (mHideUsbNotification && !mSupportsAllCombinations)) {
|| ("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
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;
}
}