Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eba7798a authored by Jaewan Kim's avatar Jaewan Kim Committed by android-build-merger
Browse files

Merge "Fix continous crash in WindowManager in boot" into nyc-dev am: 927b6be3 

am: 9504c659

* commit '9504c659':
  Fix continous crash in WindowManager in boot

Change-Id: I36a0bd9f4da496436321b463ff3cedb21e5546ab
parents f87633a4 9504c659

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;