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

am: 927b6be3d9

* commit '927b6be3d960a42bbc75aacc8dcde792a1d564b4':
  Fix continous crash in WindowManager in boot

Change-Id: I6207c320404ff1f0fed5284afe550a9163ea78a7
This commit is contained in:
Jaewan Kim
2016-05-12 12:35:42 +00:00
committed by android-build-merger

View File

@@ -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;