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

Commit 85a2ecd9 authored by Tiger Huang's avatar Tiger Huang Committed by android-build-merger
Browse files

Merge "Prevent infinite layout while hiding nav bar on keyguard" into pi-dev 

am: a41c75d6

Change-Id: I947004db70bb1c7da4e23ac6ce33b2c2214bb4bd
parents 2aa9dc11 a41c75d6

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