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

Commit 73e103bc authored by Sergey Serokurov's avatar Sergey Serokurov Committed by Automerger Merge Worker
Browse files

Merge "Process only app initiated removals in onEntryRemoved callback" into tm-dev am: 90951083 

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



Change-Id: I0293390b64b2a89166761b1a9df41a1e03f20f55
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ab74ee0 90951083

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()));