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

Commit 9d97b5b8 authored by Andrew Chant's avatar Andrew Chant Committed by android-build-merger
Browse files

Merge "Fix crash." into qt-dev am: b8337e9e 

am: ad508680

Change-Id: Id0ffb3fce5d25eb1d0d008fdd0a99a0f6009373a
parents e4f444d8 ad508680

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

+3 −0
Original line number Diff line number Diff line
@@ -542,6 +542,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi 
     * status bar, otherwise returns {@link Display#INVALID_DISPLAY}.

     */

    public int getExpandedDisplayId(Context context) {

        if (mStackView == null) {

            return INVALID_DISPLAY;

        }

        boolean defaultDisplay = context.getDisplay() != null

                && context.getDisplay().getDisplayId() == DEFAULT_DISPLAY;

        Bubble b = mStackView.getExpandedBubble();