Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Adding additional null checks for BubbleController." into qt-qpr1-dev

Browse Source
This commit is contained in:
Eric Berglund
2019-12-05 17:57:59 +00:00
committed by Android (Google) Code Review
parent 0f57fd1559 b7fc7fd466
commit 297a84231f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,7 +3386,9 @@ public class StatusBar extends SystemUI implements DemoMode,
if (mNotificationPanel.canPanelBeCollapsed()) {
animateCollapsePanels();
} else {
mBubbleController.performBackPressIfNeeded();
if (mBubbleController != null) {
mBubbleController.performBackPressIfNeeded();
}
}
return true;
}