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. am: b7fc7fd466

Browse Source 
Change-Id: I1d8e2003f7984117968c34cbcbe467a141fdfd2a
This commit is contained in:
Automerger Merge Worker
2019-12-05 18:17:14 +00:00
parent 33d4c46858 b7fc7fd466
commit 2466763f7c
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;
}