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

Commit 9e6a7643 authored by Beverly's avatar Beverly
Browse files

Don't remove bubbless onClearAll or onNotifClick 

Test: atest NotificationManagerServiceTest
Fixes: 149396544
Change-Id: I8e124ea325d7b2fad171a013100bbbed5602edae
parent e6c57082

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java

+1 −1
Original line number Diff line number Diff line
@@ -638,9 +638,9 @@ public class NotifCollection implements Dumpable { 
    private static boolean shouldDismissOnClearAll(

            NotificationEntry entry,

            @UserIdInt int userId) {

        // TODO: (b/149396544) add FLAG_BUBBLE check here + in NoManService

        return userIdMatches(entry, userId)

                && entry.isClearable()

                && !hasFlag(entry, Notification.FLAG_BUBBLE)

                && entry.getDismissState() != DISMISSED;

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java

+4 −0
Original line number Diff line number Diff line
@@ -365,8 +365,12 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit 
        } catch (RemoteException ex) {

            // system process is dead if we're here.

        }



        if (!isBubble) {

            if (parentToCancelFinal != null) {

                // TODO: (b/145659174) remove - this cancels the parent if the notification clicked

                // on will auto-cancel and is the only child in the group. This won't be

                // necessary in the new pipeline due to group pruning in ShadeListBuilder.

                removeNotification(parentToCancelFinal);

            }

            if (shouldAutoCancel(sbn)

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

+3 −2
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ public class NotificationManagerService extends SystemService { 
                StatusBarNotification sbn = r.getSbn();

                cancelNotification(callingUid, callingPid, sbn.getPackageName(), sbn.getTag(),

                        sbn.getId(), Notification.FLAG_AUTO_CANCEL,

                        FLAG_FOREGROUND_SERVICE, false, r.getUserId(),

                        FLAG_FOREGROUND_SERVICE | FLAG_BUBBLE, false, r.getUserId(),

                        REASON_CLICK, nv.rank, nv.count, null);

                nv.recycle();

                reportUserInteraction(r);
@@ -7986,7 +7986,8 @@ public class NotificationManagerService extends SystemService { 


                    FlagChecker flagChecker = (int flags) -> {

                        int flagsToCheck = FLAG_ONGOING_EVENT | FLAG_NO_CLEAR;

                        if (REASON_LISTENER_CANCEL_ALL == reason) {

                        if (REASON_LISTENER_CANCEL_ALL == reason

                                || REASON_CANCEL_ALL == reason) {

                            flagsToCheck |= FLAG_BUBBLE;

                        }

                        if ((flags & flagsToCheck) != 0) {

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

+54 −15
Original line number Diff line number Diff line
@@ -5373,21 +5373,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
    }



    @Test

    public void testCancelAllNotifications_cancelsBubble() throws Exception {

        final NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel);

        nr.getSbn().getNotification().flags |= FLAG_BUBBLE;

        mService.addNotification(nr);



        mBinderService.cancelAllNotifications(PKG, nr.getSbn().getUserId());

        waitForIdle();



        StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG);

        assertEquals(0, notifs.length);

        assertEquals(0, mService.getNotificationRecordCount());

    }



    @Test

    public void testAppCancelNotifications_cancelsBubbles() throws Exception {

    public void testCancelNotificationsFromApp_cancelsBubbles() throws Exception {

        final NotificationRecord nrBubble = generateNotificationRecord(mTestNotificationChannel);

        nrBubble.getSbn().getNotification().flags |= FLAG_BUBBLE;
@@ -5412,6 +5398,20 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        assertEquals(0, mService.getNotificationRecordCount());

    }



    @Test

    public void testCancelAllNotificationsFromApp_cancelsBubble() throws Exception {

        final NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel);

        nr.getSbn().getNotification().flags |= FLAG_BUBBLE;

        mService.addNotification(nr);



        mBinderService.cancelAllNotifications(PKG, nr.getSbn().getUserId());

        waitForIdle();



        StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG);

        assertEquals(0, notifs.length);

        assertEquals(0, mService.getNotificationRecordCount());

    }



    @Test

    public void testCancelAllNotificationsFromListener_ignoresBubbles() throws Exception {

        final NotificationRecord nrNormal = generateNotificationRecord(mTestNotificationChannel);
@@ -5447,6 +5447,25 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        assertEquals(1, mService.getNotificationRecordCount());

    }



    @Test

    public void testCancelAllNotificationsFromStatusBar_ignoresBubble() throws Exception {

        // GIVEN a notification bubble

        final NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel);

        nr.getSbn().getNotification().flags |= FLAG_BUBBLE;

        mService.addNotification(nr);



        // WHEN the status bar clears all notifications

        mService.mNotificationDelegate.onClearAll(mUid, Binder.getCallingPid(),

                nr.getSbn().getUserId());

        waitForIdle();



        // THEN the bubble notification does not get removed

        StatusBarNotification[] notifs = mBinderService.getActiveNotifications(PKG);

        assertEquals(1, notifs.length);

        assertEquals(1, mService.getNotificationRecordCount());

    }





    @Test

    public void testGetAllowedAssistantAdjustments() throws Exception {

        List<String> capabilities = mBinderService.getAllowedAssistantAdjustments(null);
@@ -6104,6 +6123,26 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        assertEquals(1, notifsAfter.length);

    }



    @Test

    public void testNotificationBubbles_bubbleStays_whenClicked()

            throws Exception {

        // GIVEN a notification that has the auto cancels flag (cancel on click) and is a bubble

        setUpPrefsForBubbles(PKG, mUid, true /* global */, true /* app */, true /* channel */);

        final NotificationRecord nr = generateNotificationRecord(mTestNotificationChannel);

        nr.getSbn().getNotification().flags |= FLAG_BUBBLE | FLAG_AUTO_CANCEL;

        mService.addNotification(nr);



        // WHEN we click the notification

        final NotificationVisibility nv = NotificationVisibility.obtain(nr.getKey(), 1, 2, true);

        mService.mNotificationDelegate.onNotificationClick(mUid, Binder.getCallingPid(),

                nr.getKey(), nv);

        waitForIdle();



        // THEN the bubble should still exist

        StatusBarNotification[] notifsAfter = mBinderService.getActiveNotifications(PKG);

        assertEquals(1, notifsAfter.length);

    }



    @Test

    public void testLoadDefaultApprovedServices_emptyResources() {

        TestableResources tr = mContext.getOrCreateTestableResources();