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

Commit a41c75d6 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" into pi-dev

parents a70ada7e c501b06d

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

+0 −5
Original line number Diff line number Diff line
@@ -5761,11 +5761,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    mStatusBarController.updateVisibilityLw(false /*transientAllowed*/,

                            mLastSystemUiFlags, mLastSystemUiFlags);

                }

                if (statusBarExpanded && mNavigationBar != null) {

                    if (mNavigationBarController.setBarShowingLw(true)) {

                        changes |= FINISH_LAYOUT_REDO_LAYOUT;

                    }

                }

            } else if (mTopFullscreenOpaqueWindowState != null) {

                topIsFullscreen = topAppHidesStatusBar;

                // The subtle difference between the window for mTopFullscreenOpaqueWindowState