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

Commit 5a38ae59 authored by Tiger Huang's avatar Tiger Huang Committed by Automerger Merge Worker
Browse files

Merge "Check mAttachInfo.mSystemUiVisibility to see if a SysUI flag exists"... 

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

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



Change-Id: I15793aebdcd6b781134c1929379740b309366a50
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa005d7c d5d86912

core/java/android/view/ViewRootImpl.java

+1 −2
Original line number Diff line number Diff line
@@ -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;

            }