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

Commit 0a554846 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Prevent infinite layout while hiding nav bar on keyguard"

parents 6f380221 53e8cfe7

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

+2 −1
Original line number Diff line number Diff line
@@ -5747,7 +5747,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    mStatusBarController.updateVisibilityLw(false /*transientAllowed*/,

                            mLastSystemUiFlags, mLastSystemUiFlags);

                }

                if (statusBarExpanded && mNavigationBar != null) {

                final boolean isKeyguardShowing = isStatusBarKeyguard() && !mKeyguardOccluded;

                if (statusBarExpanded && !isKeyguardShowing && mNavigationBar != null) {

                    if (mNavigationBarController.setBarShowingLw(true)) {

                        changes |= FINISH_LAYOUT_REDO_LAYOUT;

                    }