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

Update NotificationRecord of snooze even after it is cancelled

Browse Source 
Symptom:
If a snoozed notification is cancelled and new notification that has
same key is registered, the system continue to snooze the
notification. But the notification won't be notified when the snoozing
period expires.

Root cause:
SnoozeHelper doesn't update NotificationRecord if the existing record
has already been cancelled. SnoozeHelper continue to use existing
cancelled record. So SnoozeHelper doesn't repost notification when the
snoozing period expires.

Solution:
SnoozeHelper updates NotificationRecord even if the existing record
has been cancelled.

Test: atest SnoozeHelperTest

Fixes: 140462813
Change-Id: I43468bf8ac712e09c288d71965dae34de439c5a8
This commit is contained in:
Koji Fukui
2019-09-02 20:06:36 +09:00
committed by Jay Aliomer
parent 155d803a4b
commit 70e0aa487d
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/notification/SnoozeHelper.java
View File

@@ -374,9 +374,6 @@ public class SnoozeHelper {
return;
}
NotificationRecord existing = pkgRecords.get(record.getKey());
if (existing != null && existing.isCanceled) {
return;
}
pkgRecords.put(record.getKey(), record);
}

20
services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java
View File

@@ -349,6 +349,26 @@ public class SnoozeHelperTest extends UiServiceTestCase {
verify(mCallback, times(1)).repost(UserHandle.USER_SYSTEM, r);
}
@Test
public void testUpdateAfterCancel() throws Exception {
// snooze a notification
NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM);
mSnoozeHelper.snooze(r , 1000);
// cancel the notification
mSnoozeHelper.cancel(UserHandle.USER_SYSTEM, false);
// update the notification
r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM);
mSnoozeHelper.update(UserHandle.USER_SYSTEM, r);
// verify callback is called when repost (snooze is expired)
verify(mCallback, never()).repost(anyInt(), any(NotificationRecord.class));
mSnoozeHelper.repost(r.getKey(), UserHandle.USER_SYSTEM);
verify(mCallback, times(1)).repost(UserHandle.USER_SYSTEM, r);
assertFalse(r.isCanceled);
}
@Test
public void testGetSnoozedByUser() throws Exception {
NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM);