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

Merge "Fix random systemui crashes during boot"

Browse Source
This commit is contained in:
Jason Monk
2017-09-20 13:50:45 +00:00
committed by Gerrit Code Review
parent 83c367aa5b 81e684b76b
commit 8078996f4a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3842,8 +3842,10 @@ public class StatusBar extends SystemUI implements DemoMode,
} }
public void onKeyguardOccludedChanged(boolean keyguardOccluded) { public void onKeyguardOccludedChanged(boolean keyguardOccluded) {
if (mNavigationBar != null) {
mNavigationBar.onKeyguardOccludedChanged(keyguardOccluded); mNavigationBar.onKeyguardOccludedChanged(keyguardOccluded);
} }
}
// State logging // State logging
@@ -4633,7 +4635,8 @@ public class StatusBar extends SystemUI implements DemoMode,
// TODO: Figure out way to remove this. // TODO: Figure out way to remove this.
public NavigationBarView getNavigationBarView() { public NavigationBarView getNavigationBarView() {
return (NavigationBarView) mNavigationBar.getView(); return (mNavigationBar != null) ?
(NavigationBarView) mNavigationBar.getView() : null;
} }
// ---------------------- DragDownHelper.OnDragDownListener ------------------------------------ // ---------------------- DragDownHelper.OnDragDownListener ------------------------------------