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

Commit 96537715 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:... 

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

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

Change-Id: I0b15625360433cf1cf498c7c5094bec897732767
parents 7c79b15a 0397de2c

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