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

Merge "Fix continous crash in WindowManager in boot" into nyc-dev

Browse Source
This commit is contained in:
Jaewan Kim
2016-05-12 12:32:00 +00:00
committed by Android (Google) Code Review
parent 4ee1c943ab 3328433f13
commit 927b6be3d9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -3957,7 +3957,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (!isKeyguardShowing) { if (!isKeyguardShowing) {
navTranslucent &= areTranslucentBarsAllowed(); navTranslucent &= areTranslucentBarsAllowed();
} }
boolean statusBarExpandedNotKeyguard = !isKeyguardShowing boolean statusBarExpandedNotKeyguard = !isKeyguardShowing && mStatusBar != null
&& mStatusBar.getAttrs().height == MATCH_PARENT && mStatusBar.getAttrs().height == MATCH_PARENT
&& mStatusBar.getAttrs().width == MATCH_PARENT; && mStatusBar.getAttrs().width == MATCH_PARENT;