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

2016-05-12 12:32:00 +00:00
parent 4ee1c943ab 3328433f13
commit 927b6be3d9
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -3957,7 +3957,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
            if (!isKeyguardShowing) {
                navTranslucent &= areTranslucentBarsAllowed();
            }
-            boolean statusBarExpandedNotKeyguard = !isKeyguardShowing
+            boolean statusBarExpandedNotKeyguard = !isKeyguardShowing && mStatusBar != null
                    && mStatusBar.getAttrs().height == MATCH_PARENT
                    && mStatusBar.getAttrs().width == MATCH_PARENT;