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

Commit b7fc7fd4 authored by Eric Berglund's avatar Eric Berglund
Browse files

DO NOT MERGE Adding additional null checks for BubbleController. 

Bug: 145155858
Test: Manual
Change-Id: I1f68423816aaa48a0040623488ee69237b372149
parent f998947a

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+5 −3
Original line number Diff line number Diff line
@@ -2638,7 +2638,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                if (mRemoteInputManager.getController() != null) {

                    mRemoteInputManager.getController().closeRemoteInputs();

                }

                if (mBubbleController.isStackExpanded()) {

                if (mBubbleController != null && mBubbleController.isStackExpanded()) {

                    mBubbleController.collapseStack();

                }

                if (mLockscreenUserManager.isCurrentProfile(getSendingUserId())) {
@@ -2654,7 +2654,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                if (mStatusBarWindowController != null) {

                    mStatusBarWindowController.setNotTouchable(false);

                }

                if (mBubbleController.isStackExpanded()) {

                if (mBubbleController != null && mBubbleController.isStackExpanded()) {

                    mBubbleController.collapseStack();

                }

                finishBarAnimations();
@@ -3386,8 +3386,10 @@ public class StatusBar extends SystemUI implements DemoMode, 
            if (mNotificationPanel.canPanelBeCollapsed()) {

                animateCollapsePanels();

            } else {

                if (mBubbleController != null) {

                    mBubbleController.performBackPressIfNeeded();

                }

            }

            return true;

        }

        if (mKeyguardUserSwitcher != null && mKeyguardUserSwitcher.hideIfNotSimple(true)) {