Merge "Fix invalid bubble predicate once and for all" into rvc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
10f788d8e2
@@ -368,6 +368,10 @@ public class BubbleData {
|
|||||||
|
|
||||||
final Predicate<Bubble> invalidBubblesFromPackage = bubble -> {
|
final Predicate<Bubble> invalidBubblesFromPackage = bubble -> {
|
||||||
final boolean bubbleIsFromPackage = packageName.equals(bubble.getPackageName());
|
final boolean bubbleIsFromPackage = packageName.equals(bubble.getPackageName());
|
||||||
|
final boolean isShortcutBubble = bubble.hasMetadataShortcutId();
|
||||||
|
if (!bubbleIsFromPackage || !isShortcutBubble) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
final boolean hasShortcutIdAndValidShortcut =
|
final boolean hasShortcutIdAndValidShortcut =
|
||||||
bubble.hasMetadataShortcutId()
|
bubble.hasMetadataShortcutId()
|
||||||
&& bubble.getShortcutInfo() != null
|
&& bubble.getShortcutInfo() != null
|
||||||
|
|||||||
Reference in New Issue
Block a user