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

Merge "Suppress bubble notifs instead of cancel" into rvc-dev

Browse Source
This commit is contained in:
Lyn Han
2020-06-09 20:04:57 +00:00
committed by Android (Google) Code Review
parent db853ad3fd 675570af1d
commit 692e990f06
2 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -4015,7 +4015,7 @@ public class NotificationManagerService extends SystemService {
private void cancelNotificationFromListenerLocked(ManagedServiceInfo info,
int callingUid, int callingPid, String pkg, String tag, int id, int userId) {
cancelNotification(callingUid, callingPid, pkg, tag, id, 0,
FLAG_ONGOING_EVENT | FLAG_FOREGROUND_SERVICE | FLAG_BUBBLE,
FLAG_ONGOING_EVENT | FLAG_FOREGROUND_SERVICE,
true,
userId, REASON_LISTENER_CANCEL, info);
}
@@ -6248,6 +6248,13 @@ public class NotificationManagerService extends SystemService {
mUsageStats.registerClickedByUser(r);
}
if (mReason == REASON_LISTENER_CANCEL
&& (r.getNotification().flags & FLAG_BUBBLE) != 0) {
mNotificationDelegate.onBubbleNotificationSuppressionChanged(
r.getKey(), /* suppressed */ true);
return;
}
if ((r.getNotification().flags & mMustHaveFlags) != mMustHaveFlags) {
return;
}

48
services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
View File

@@ -5455,25 +5455,49 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
}
@Test
public void testCancelNotificationsFromListener_ignoresBubbles() throws Exception {
final NotificationRecord nrNormal = generateNotificationRecord(mTestNotificationChannel);
final NotificationRecord nrBubble = generateNotificationRecord(mTestNotificationChannel);
nrBubble.getSbn().getNotification().flags |= FLAG_BUBBLE;
public void testCancelNotificationsFromListener_cancelsNonBubble() throws Exception {
// Add non-bubble notif
final NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel);
mService.addNotification(nr);
mService.addNotification(nrNormal);
mService.addNotification(nrBubble);
String[] keys = {nrNormal.getSbn().getKey(), nrBubble.getSbn().getKey()};
// Cancel via listener
String[] keys = {nr.getSbn().getKey()};
mService.getBinderService().cancelNotificationsFromListener(null, keys);
waitForIdle();
// Notif not active anymore
StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG);
assertEquals(0, notifs.length);
assertEquals(0, mService.getNotificationRecordCount());
// Cancel event is logged
assertEquals(1, mNotificationRecordLogger.numCalls());
assertEquals(NotificationRecordLogger.NotificationCancelledEvent
.NOTIFICATION_CANCEL_LISTENER_CANCEL, mNotificationRecordLogger.event(0));
}
@Test
public void testCancelNotificationsFromListener_suppressesBubble() throws Exception {
// Add bubble notif
setUpPrefsForBubbles(PKG, mUid,
true /* global */,
BUBBLE_PREFERENCE_ALL /* app */,
true /* channel */);
NotificationRecord nr = generateMessageBubbleNotifRecord(mTestNotificationChannel, "tag");
mBinderService.enqueueNotificationWithTag(PKG, PKG, nr.getSbn().getTag(),
nr.getSbn().getId(), nr.getSbn().getNotification(), nr.getSbn().getUserId());
waitForIdle();
// Cancel via listener
String[] keys = {nr.getSbn().getKey()};
mService.getBinderService().cancelNotificationsFromListener(null, keys);
waitForIdle();
// Bubble notif active and suppressed
StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG);
assertEquals(1, notifs.length);
assertEquals(1, mService.getNotificationRecordCount());
assertEquals(1, mNotificationRecordLogger.numCalls());
assertEquals(NotificationRecordLogger.NotificationCancelledEvent
.NOTIFICATION_CANCEL_LISTENER_CANCEL, mNotificationRecordLogger.event(0));
assertTrue(notifs[0].getNotification().getBubbleMetadata().isNotificationSuppressed());
}
@Test