Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1405ea18 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: If33002e5a51d05a754b59835643f944106fb657c
parents 5f704537 10f788d8

packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java

+4 −0
Original line number Diff line number Diff line
@@ -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