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

DO NOT MERGE Adding additional null checks for BubbleController.

Browse Source 
Bug: 145155858
Test: Manual
Change-Id: I1f68423816aaa48a0040623488ee69237b372149
This commit is contained in:
Eric Berglund
2019-11-27 09:48:27 -08:00
parent f998947a6f
commit b7fc7fd466
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) { 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,7 +3386,9 @@ public class StatusBar extends SystemUI implements DemoMode,
if (mNotificationPanel.canPanelBeCollapsed()) { if (mNotificationPanel.canPanelBeCollapsed()) {
animateCollapsePanels(); animateCollapsePanels();
} else { } else {
mBubbleController.performBackPressIfNeeded(); if (mBubbleController != null) {
mBubbleController.performBackPressIfNeeded();
}
} }
return true; return true;
} }