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

am: a41c75d6d0

Change-Id: I947004db70bb1c7da4e23ac6ce33b2c2214bb4bd
This commit is contained in:
Tiger Huang
2018-06-01 04:58:42 -07:00
committed by android-build-merger

View File

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