From 3328433f13c6f357cfca98553ff90fabe1da9c1e Mon Sep 17 00:00:00 2001
From: Jaewan Kim <jaewan@google.com>
Date: Thu, 12 May 2016 18:55:46 +0900
Subject: Fix continous crash in WindowManager in boot

Bug: 28728894
Change-Id: I660e2709a674eb4089dbb38173375491a87828db
---
 services/core/java/com/android/server/policy/PhoneWindowManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 0a5b82aaaa49..b2cf89b17cfc 100644
--- 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;
 
-- 
cgit v1.2.3-59-g8ed1b