Merge "Check mAttachInfo.mSystemUiVisibility to see if a SysUI flag exists" into tm-dev am: d5d86912aa

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17394904

Change-Id: I48880db1fc0e8e705fd04e2b3be4c3056d2e4af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tiger Huang
2022-03-25 10:33:14 +00:00
committed by Automerger Merge Worker

View File

@@ -2338,10 +2338,9 @@ public final class ViewRootImpl implements ViewParent,
final int systemUiFlag = publicType == Type.statusBars()
? View.SYSTEM_UI_FLAG_FULLSCREEN
: View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
final boolean wasVisible = (info.globalVisibility & systemUiFlag) == 0;
if (visible) {
info.globalVisibility &= ~systemUiFlag;
if (!wasVisible && hasControl) {
if (hasControl && (mAttachInfo.mSystemUiVisibility & systemUiFlag) != 0) {
// The local system UI visibility can only be cleared while we have the control.
info.localChanges |= systemUiFlag;
}