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

Commit f8e96bdd authored by Ats Jenk's avatar Ats Jenk Committed by Android (Google) Code Review
Browse files

Merge "Remove duplicate getActiveBubbles" into main

parents 159516d4 b704fbf6

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+1 −1
Original line number Diff line number Diff line
@@ -1772,7 +1772,7 @@ public class BubbleController implements ConfigurationChangeListener, 
        if (groupKey == null) {

            return bubbleChildren;

        }

        for (Bubble bubble : mBubbleData.getActiveBubbles()) {

        for (Bubble bubble : mBubbleData.getBubbles()) {

            if (bubble.getGroupKey() != null && groupKey.equals(bubble.getGroupKey())) {

                bubbleChildren.add(bubble);

            }

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleData.java

+0 −5
Original line number Diff line number Diff line
@@ -339,11 +339,6 @@ public class BubbleData { 
        return mOverflow;

    }



    /** Return a read-only current active bubble lists. */

    public List<Bubble> getActiveBubbles() {

        return Collections.unmodifiableList(mBubbles);

    }



    public void setExpanded(boolean expanded) {

        setExpandedInternal(expanded);

        dispatchPendingChanges();