Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07530202 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Limit the number of concurrently snoozed notifications am: bc808de2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205942



Change-Id: I3e18ebaacd69e02859eef7812a4b845fa24b93ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de7b0f6d bc808de2

services/core/java/com/android/server/notification/NotificationManagerService.java

+14 −5
Original line number Diff line number Diff line
@@ -6816,6 +6816,7 @@ public class NotificationManagerService extends SystemService { 


        @GuardedBy("mNotificationLock")

        void snoozeLocked(NotificationRecord r) {

            final List<NotificationRecord> recordsToSnooze = new ArrayList<>();

            if (r.getSbn().isGroup()) {

                final List<NotificationRecord> groupNotifications =

                        findCurrentAndSnoozedGroupNotificationsLocked(
@@ -6824,8 +6825,8 @@ public class NotificationManagerService extends SystemService { 
                if (r.getNotification().isGroupSummary()) {

                    // snooze all children

                    for (int i = 0; i < groupNotifications.size(); i++) {

                        if (mKey != groupNotifications.get(i).getKey()) {

                            snoozeNotificationLocked(groupNotifications.get(i));

                        if (!mKey.equals(groupNotifications.get(i).getKey())) {

                            recordsToSnooze.add(groupNotifications.get(i));

                        }

                    }

                } else {
@@ -6835,8 +6836,8 @@ public class NotificationManagerService extends SystemService { 
                        if (groupNotifications.size() == 2) {

                            // snooze summary and the one child

                            for (int i = 0; i < groupNotifications.size(); i++) {

                                if (mKey != groupNotifications.get(i).getKey()) {

                                    snoozeNotificationLocked(groupNotifications.get(i));

                                if (!mKey.equals(groupNotifications.get(i).getKey())) {

                                    recordsToSnooze.add(groupNotifications.get(i));

                                }

                            }

                        }
@@ -6844,7 +6845,15 @@ public class NotificationManagerService extends SystemService { 
                }

            }

            // snooze the notification

            snoozeNotificationLocked(r);

            recordsToSnooze.add(r);



            if (mSnoozeHelper.canSnooze(recordsToSnooze.size())) {

                for (int i = 0; i < recordsToSnooze.size(); i++) {

                    snoozeNotificationLocked(recordsToSnooze.get(i));

                }

            } else {

                Log.w(TAG, "Cannot snooze " + r.getKey() + ": too many snoozed notifications");

            }



        }

services/core/java/com/android/server/notification/SnoozeHelper.java

+11 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ import java.util.Set; 
public class SnoozeHelper {

    public static final int XML_SNOOZED_NOTIFICATION_VERSION = 1;



    static final int CONCURRENT_SNOOZE_LIMIT = 500;



    protected static final String XML_TAG_NAME = "snoozed-notifications";



    private static final String XML_SNOOZED_NOTIFICATION = "notification";
@@ -134,6 +136,15 @@ public class SnoozeHelper { 
        }

    }



    protected boolean canSnooze(int numberToSnooze) {

        synchronized (mLock) {

            if ((mPackages.size() + numberToSnooze) > CONCURRENT_SNOOZE_LIMIT) {

                return false;

            }

        }

        return true;

    }



    @NonNull

    protected Long getSnoozeTimeForUnpostedNotification(int userId, String pkg, String key) {

        Long time = null;

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

+74 −9
Original line number Diff line number Diff line
@@ -2779,39 +2779,98 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
    }



    @Test

    public void testSnoozeRunnable_reSnoozeASingleSnoozedNotification() throws Exception {

    public void testSnoozeRunnable_tooManySnoozed_singleNotification() {

        final NotificationRecord notification = generateNotificationRecord(

                mTestNotificationChannel, 1, null, true);

        mService.addNotification(notification);

        when(mSnoozeHelper.getNotification(any())).thenReturn(notification);



        when(mSnoozeHelper.canSnooze(anyInt())).thenReturn(true);

        when(mSnoozeHelper.canSnooze(1)).thenReturn(false);



        NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable =

                mService.new SnoozeNotificationRunnable(

                        notification.getKey(), 100, null);

        snoozeNotificationRunnable.run();

        NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable2 =



        verify(mSnoozeHelper, never()).snooze(any(NotificationRecord.class), anyLong());

        assertEquals(1, mService.getNotificationRecordCount());

    }



    @Test

    public void testSnoozeRunnable_tooManySnoozed_singleGroupChildNotification() {

        final NotificationRecord notification = generateNotificationRecord(

                mTestNotificationChannel, 1, "group", true);

        final NotificationRecord notificationChild = generateNotificationRecord(

                mTestNotificationChannel, 1, "group", false);

        mService.addNotification(notification);

        mService.addNotification(notificationChild);



        when(mSnoozeHelper.canSnooze(anyInt())).thenReturn(true);

        when(mSnoozeHelper.canSnooze(2)).thenReturn(false);



        NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable =

                mService.new SnoozeNotificationRunnable(

                        notificationChild.getKey(), 100, null);

        snoozeNotificationRunnable.run();



        verify(mSnoozeHelper, never()).snooze(any(NotificationRecord.class), anyLong());

        assertEquals(2, mService.getNotificationRecordCount());

    }



    @Test

    public void testSnoozeRunnable_tooManySnoozed_summaryNotification() {

        final NotificationRecord notification = generateNotificationRecord(

                mTestNotificationChannel, 1, "group", true);

        final NotificationRecord notificationChild = generateNotificationRecord(

                mTestNotificationChannel, 12, "group", false);

        final NotificationRecord notificationChild2 = generateNotificationRecord(

                mTestNotificationChannel, 13, "group", false);

        mService.addNotification(notification);

        mService.addNotification(notificationChild);

        mService.addNotification(notificationChild2);



        when(mSnoozeHelper.canSnooze(anyInt())).thenReturn(true);

        when(mSnoozeHelper.canSnooze(3)).thenReturn(false);



        NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable =

                mService.new SnoozeNotificationRunnable(

                        notification.getKey(), 100, null);

        snoozeNotificationRunnable.run();



        verify(mSnoozeHelper, never()).snooze(any(NotificationRecord.class), anyLong());

        assertEquals(3, mService.getNotificationRecordCount());

    }



    @Test

    public void testSnoozeRunnable_reSnoozeASingleSnoozedNotification() throws Exception {

        final NotificationRecord notification = generateNotificationRecord(

                mTestNotificationChannel, 1, null, true);

        mService.addNotification(notification);

        when(mSnoozeHelper.getNotification(any())).thenReturn(notification);

        when(mSnoozeHelper.canSnooze(anyInt())).thenReturn(true);



        NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable =

                mService.new SnoozeNotificationRunnable(

                notification.getKey(), 100, null);

        snoozeNotificationRunnable.run();

        snoozeNotificationRunnable.run();



        // snooze twice

        verify(mSnoozeHelper, times(2)).snooze(any(NotificationRecord.class), anyLong());

    }



    @Test

    public void testSnoozeRunnable_reSnoozeASnoozedNotificationWithGroupKey() throws Exception {

    public void testSnoozeRunnable_reSnoozeASnoozedNotificationWithGroupKey() {

        final NotificationRecord notification = generateNotificationRecord(

                mTestNotificationChannel, 1, "group", true);

        mService.addNotification(notification);

        when(mSnoozeHelper.getNotification(any())).thenReturn(notification);

        when(mSnoozeHelper.canSnooze(anyInt())).thenReturn(true);



        NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable =

                mService.new SnoozeNotificationRunnable(

                notification.getKey(), 100, null);

        snoozeNotificationRunnable.run();

        NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable2 =

                mService.new SnoozeNotificationRunnable(

                notification.getKey(), 100, null);

        snoozeNotificationRunnable.run();



        // snooze twice
@@ -2829,6 +2888,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        when(mSnoozeHelper.getNotification(any())).thenReturn(notification);

        when(mSnoozeHelper.getNotifications(

                anyString(), anyString(), anyInt())).thenReturn(new ArrayList<>());

        when(mSnoozeHelper.canSnooze(anyInt())).thenReturn(true);



        NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable =

                mService.new SnoozeNotificationRunnable(
@@ -2838,8 +2898,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
                .thenReturn(new ArrayList<>(Arrays.asList(notification, notification2)));

        NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable2 =

                mService.new SnoozeNotificationRunnable(

                        notification.getKey(), 100, null);

        snoozeNotificationRunnable.run();

                        notification2.getKey(), 100, null);

        snoozeNotificationRunnable2.run();



        // snooze twice

        verify(mSnoozeHelper, times(4)).snooze(any(NotificationRecord.class), anyLong());
@@ -2853,6 +2913,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
                mTestNotificationChannel, 2, "group", false);

        mService.addNotification(grouped);

        mService.addNotification(nonGrouped);

        when(mSnoozeHelper.canSnooze(anyInt())).thenReturn(true);



        NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable =

                mService.new SnoozeNotificationRunnable(
@@ -2882,6 +2943,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        mService.addNotification(parent);

        mService.addNotification(child);

        mService.addNotification(child2);

        when(mSnoozeHelper.canSnooze(anyInt())).thenReturn(true);



        NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable =

                mService.new SnoozeNotificationRunnable(
@@ -2903,6 +2965,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        mService.addNotification(parent);

        mService.addNotification(child);

        mService.addNotification(child2);

        when(mSnoozeHelper.canSnooze(anyInt())).thenReturn(true);



        NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable =

                mService.new SnoozeNotificationRunnable(
@@ -2928,6 +2991,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
                mTestNotificationChannel, 2, "group", false);

        mService.addNotification(parent);

        mService.addNotification(child);

        when(mSnoozeHelper.canSnooze(anyInt())).thenReturn(true);



        NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable =

                mService.new SnoozeNotificationRunnable(
@@ -2955,6 +3019,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        final NotificationRecord child = generateNotificationRecord(

                mTestNotificationChannel, 2, "group", false);

        mService.addNotification(child);

        when(mSnoozeHelper.canSnooze(anyInt())).thenReturn(true);



        NotificationManagerService.SnoozeNotificationRunnable snoozeNotificationRunnable =

                mService.new SnoozeNotificationRunnable(

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

+17 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.server.notification;



import static com.android.server.notification.SnoozeHelper.CONCURRENT_SNOOZE_LIMIT;

import static com.android.server.notification.SnoozeHelper.EXTRA_KEY;



import static junit.framework.Assert.assertEquals;
@@ -280,6 +281,22 @@ public class SnoozeHelperTest extends UiServiceTestCase { 
                UserHandle.USER_SYSTEM, r.getSbn().getPackageName(), r.getKey()));

    }



    @Test

    public void testSnoozeLimit() {

        for (int i = 0; i < CONCURRENT_SNOOZE_LIMIT; i++ ) {

            NotificationRecord r = getNotificationRecord("pkg", i, i+"", UserHandle.SYSTEM);



            assertTrue("cannot snooze record " + i, mSnoozeHelper.canSnooze(1));



            if (i % 2 == 0) {

                mSnoozeHelper.snooze(r, null);

            } else {

                mSnoozeHelper.snooze(r, 9000);

            }

        }

        assertFalse(mSnoozeHelper.canSnooze(1));

    }



    @Test

    public void testCancelByApp() throws Exception {

        NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM);