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 am: 7ca0ea6869

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

Change-Id: I981905f477963c8001225fdaa21b8359d12fd304
This commit is contained in:
Josh Tsuji
2020-06-24 15:57:59 +00:00
committed by Automerger Merge Worker
parent b791a1a9d1 7ca0ea6869
commit 7fda6416c5
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());
}
final Predicate<Bubble> invalidBubblesFromPackage = bubble ->
packageName.equals(bubble.getPackageName())
&& (bubble.getShortcutInfo() == null
|| !bubble.getShortcutInfo().isEnabled()
|| !validShortcutIds.contains(bubble.getShortcutInfo().getId()));
final Predicate<Bubble> invalidBubblesFromPackage = bubble -> {
final boolean bubbleIsFromPackage = packageName.equals(bubble.getPackageName());
final boolean hasShortcutIdAndValidShortcut =
bubble.hasMetadataShortcutId()
&& bubble.getShortcutInfo() != null
&& bubble.getShortcutInfo().isEnabled()
&& validShortcutIds.contains(bubble.getShortcutInfo().getId());
return bubbleIsFromPackage && !hasShortcutIdAndValidShortcut;
};
final Consumer<Bubble> removeBubble = bubble ->
dismissBubbleWithKey(bubble.getKey(), reason);