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

Commit cbb994f0 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Process only app initiated removals in onEntryRemoved callback"... 

Merge "Merge "Process only app initiated removals in onEntryRemoved callback" into tm-dev am: 90951083 am: b7ac1674 am: f1736630"
parents 30fdeec6 55a8713b

packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java

+3 −1
Original line number Diff line number Diff line
@@ -575,8 +575,10 @@ public class BubblesManager implements Dumpable { 
            @Override

            public void onEntryRemoved(NotificationEntry entry,

                    @NotifCollection.CancellationReason int reason) {

                if (reason == REASON_APP_CANCEL || reason == REASON_APP_CANCEL_ALL) {

                    BubblesManager.this.onEntryRemoved(entry);

                }

            }



            @Override

            public void onRankingUpdate(RankingMap rankingMap) {

packages/SystemUI/tests/src/com/android/systemui/wmshell/NewNotifPipelineBubblesTest.java

+2 −2
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ public class NewNotifPipelineBubblesTest extends SysuiTestCase { 
        assertTrue(mBubbleController.hasBubbles());



        // Removes the notification

        mEntryListener.onEntryRemoved(mRow, 0);

        mEntryListener.onEntryRemoved(mRow, REASON_APP_CANCEL);

        assertFalse(mBubbleController.hasBubbles());

    }
@@ -938,7 +938,7 @@ public class NewNotifPipelineBubblesTest extends SysuiTestCase { 
        mBubblesManager.handleDismissalInterception(groupSummary.getEntry());



        // WHEN the summary is cancelled by the app

        mEntryListener.onEntryRemoved(groupSummary.getEntry(), 0);

        mEntryListener.onEntryRemoved(groupSummary.getEntry(), REASON_APP_CANCEL);



        // THEN the summary and its children are removed from bubble data

        assertFalse(mBubbleData.hasBubbleInStackWithKey(groupedBubble.getEntry().getKey()));