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

Commit e51ee7ee authored by Sergey Serokurov's avatar Sergey Serokurov
Browse files

Process only app initiated removals in onEntryRemoved callback 

Bug: 220066165
Test: atest SystemUITests
Change-Id: Ica339c74c26e7a360749a3d23151ad701093b6aa
parent 2dcae951

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

+3 −1
Original line number Diff line number Diff line
@@ -576,8 +576,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()));