Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie29f873936114c16480f78ac2fbdbf2c704b4c34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sergey Serokurov
2022-04-05 17:46:23 +00:00
committed by Automerger Merge Worker
parent 13f84fc0fe 9095108312
commit b7ac1674ed
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/wmshell/BubblesManager.java
View File

@@ -576,7 +576,9 @@ public class BubblesManager implements Dumpable {
@Override @Override
public void onEntryRemoved(NotificationEntry entry, public void onEntryRemoved(NotificationEntry entry,
@NotifCollection.CancellationReason int reason) { @NotifCollection.CancellationReason int reason) {
BubblesManager.this.onEntryRemoved(entry); if (reason == REASON_APP_CANCEL || reason == REASON_APP_CANCEL_ALL) {
BubblesManager.this.onEntryRemoved(entry);
}
} }
@Override @Override

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

@@ -807,7 +807,7 @@ public class NewNotifPipelineBubblesTest extends SysuiTestCase {
assertTrue(mBubbleController.hasBubbles()); assertTrue(mBubbleController.hasBubbles());
// Removes the notification // Removes the notification
mEntryListener.onEntryRemoved(mRow, 0); mEntryListener.onEntryRemoved(mRow, REASON_APP_CANCEL);
assertFalse(mBubbleController.hasBubbles()); assertFalse(mBubbleController.hasBubbles());
} }
@@ -938,7 +938,7 @@ public class NewNotifPipelineBubblesTest extends SysuiTestCase {
mBubblesManager.handleDismissalInterception(groupSummary.getEntry()); mBubblesManager.handleDismissalInterception(groupSummary.getEntry());
// WHEN the summary is cancelled by the app // 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 // THEN the summary and its children are removed from bubble data
assertFalse(mBubbleData.hasBubbleInStackWithKey(groupedBubble.getEntry().getKey())); assertFalse(mBubbleData.hasBubbleInStackWithKey(groupedBubble.getEntry().getKey()));