Merge "Fix invalid bubble predicate once and for all" into rvc-dev am: 10f788d8e2

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

Change-Id: Iebef531a87906407f74db67f7cc90f4f24de6002
This commit is contained in:
TreeHugger Robot
2020-06-25 08:38:26 +00:00
committed by Automerger Merge Worker

View File

@@ -368,6 +368,10 @@ public class BubbleData {
final Predicate<Bubble> invalidBubblesFromPackage = bubble -> {
final boolean bubbleIsFromPackage = packageName.equals(bubble.getPackageName());
final boolean isShortcutBubble = bubble.hasMetadataShortcutId();
if (!bubbleIsFromPackage || !isShortcutBubble) {
return false;
}
final boolean hasShortcutIdAndValidShortcut =
bubble.hasMetadataShortcutId()
&& bubble.getShortcutInfo() != null