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

Commit 7ca0ea68 authored by Josh Tsuji's avatar Josh Tsuji Committed by Android (Google) Code Review
Browse files

Merge "Only remove bubbles with null shortcutinfo if they have a shortcut ID." into rvc-dev

parents 910575c1 a5d19f6b

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

+9 −5
Original line number Diff line number Diff line
@@ -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);