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

Merge "Update NotificationRecord of snooze even after it is cancelled"

Browse Source 
am: 10f4d427cd

Change-Id: Ibd4367f14ee326acfba3bb54ee701e8b0265aebf
This commit is contained in:
Jay Aliomer
2019-11-27 10:16:51 -08:00
committed by android-build-merger
parent 04cad88eee 10f4d427cd
commit d175be5ebe
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

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

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

@@ -226,6 +226,26 @@ public class SnoozeHelperTest extends UiServiceTestCase {
verify(mCallback, times(1)).repost(UserHandle.USER_SYSTEM, r); 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 @Test
public void testGetSnoozedByUser() throws Exception { public void testGetSnoozedByUser() throws Exception {
NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM); NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM);