DO NOT MERGE Adding additional null checks for BubbleController. am: b7fc7fd466 (2466763f) · Commits · e / os / android_frameworks_base

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

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2638,7 +2638,7 @@ public class StatusBar extends SystemUI implements DemoMode,
	if (mRemoteInputManager.getController() != null) {		if (mRemoteInputManager.getController() != null) {
	mRemoteInputManager.getController().closeRemoteInputs();		mRemoteInputManager.getController().closeRemoteInputs();
	}		}
	if (mBubbleController.isStackExpanded()) {		if (mBubbleController != null && mBubbleController.isStackExpanded()) {
	mBubbleController.collapseStack();		mBubbleController.collapseStack();
	}		}
	if (mLockscreenUserManager.isCurrentProfile(getSendingUserId())) {		if (mLockscreenUserManager.isCurrentProfile(getSendingUserId())) {
	@@ -2654,7 +2654,7 @@ public class StatusBar extends SystemUI implements DemoMode,
	if (mStatusBarWindowController != null) {		if (mStatusBarWindowController != null) {
	mStatusBarWindowController.setNotTouchable(false);		mStatusBarWindowController.setNotTouchable(false);
	}		}
	if (mBubbleController.isStackExpanded()) {		if (mBubbleController != null && mBubbleController.isStackExpanded()) {
	mBubbleController.collapseStack();		mBubbleController.collapseStack();
	}		}
	finishBarAnimations();		finishBarAnimations();
	@@ -3386,8 +3386,10 @@ public class StatusBar extends SystemUI implements DemoMode,
	if (mNotificationPanel.canPanelBeCollapsed()) {		if (mNotificationPanel.canPanelBeCollapsed()) {
	animateCollapsePanels();		animateCollapsePanels();
	} else {		} else {
			if (mBubbleController != null) {
	mBubbleController.performBackPressIfNeeded();		mBubbleController.performBackPressIfNeeded();
	}		}
			}
	return true;		return true;
	}		}
	if (mKeyguardUserSwitcher != null && mKeyguardUserSwitcher.hideIfNotSimple(true)) {		if (mKeyguardUserSwitcher != null && mKeyguardUserSwitcher.hideIfNotSimple(true)) {