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 am: 927b6be3d9

Browse Source 
am: 1f7f01ec77

* commit '1f7f01ec777a4d1fc510dadb1d0f8acbb1d56003':
  Fix continous crash in WindowManager in boot

Change-Id: I7572be9a42b89b87b87bcfc5205db6263d17a802
This commit is contained in:
Jaewan Kim
2016-05-12 12:38:11 +00:00
committed by android-build-merger
parent f87633a4d1 1f7f01ec77
commit 0cf458ca4a
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;