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

Merge "Only remove bubbles with null shortcutinfo if they have a shortcut ID." into rvc-dev

Browse Source
This commit is contained in:
Josh Tsuji
2020-06-24 15:39:09 +00:00
committed by Android (Google) Code Review
parent 910575c19c a5d19f6b07
commit 7ca0ea6869
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
View File

@@ -366,11 +366,15 @@ public class BubbleData {
validShortcutIds.add(info.getId()); validShortcutIds.add(info.getId());
} }
final Predicate<Bubble> invalidBubblesFromPackage = bubble -> final Predicate<Bubble> invalidBubblesFromPackage = bubble -> {
packageName.equals(bubble.getPackageName()) final boolean bubbleIsFromPackage = packageName.equals(bubble.getPackageName());
&& (bubble.getShortcutInfo() == null final boolean hasShortcutIdAndValidShortcut =
|| !bubble.getShortcutInfo().isEnabled() bubble.hasMetadataShortcutId()
|| !validShortcutIds.contains(bubble.getShortcutInfo().getId())); && bubble.getShortcutInfo() != null
&& bubble.getShortcutInfo().isEnabled()
&& validShortcutIds.contains(bubble.getShortcutInfo().getId());
return bubbleIsFromPackage && !hasShortcutIdAndValidShortcut;
};
final Consumer<Bubble> removeBubble = bubble -> final Consumer<Bubble> removeBubble = bubble ->
dismissBubbleWithKey(bubble.getKey(), reason); dismissBubbleWithKey(bubble.getKey(), reason);