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

Commit 8f46dc37 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by android-build-merger
Browse files

Merge "Clear VISIBLE_FOR_USER flag when isHiddenFromUser is true" into qt-dev am: f8b8c20c 

am: 248189d5

Change-Id: I46194045e80107c03c8bc5d0ba1bb3650a293cc7
parents 03edd1da 248189d5

services/core/java/com/android/server/wm/WindowState.java

+3 −1
Original line number Diff line number Diff line
@@ -1457,10 +1457,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


    void clearPolicyVisibilityFlag(int policyVisibilityFlag) {

        mPolicyVisibility &= ~policyVisibilityFlag;

        mWmService.scheduleAnimationLocked();

    }



    void setPolicyVisibilityFlag(int policyVisibilityFlag) {

        mPolicyVisibility |= policyVisibilityFlag;

        mWmService.scheduleAnimationLocked();

    }



    private boolean isLegacyPolicyVisibility() {
@@ -3934,7 +3936,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
    boolean performShowLocked() {

        if (isHiddenFromUserLocked()) {

            if (DEBUG_VISIBILITY) Slog.w(TAG, "hiding " + this + ", belonging to " + mOwnerUid);

            hideLw(false);

            clearPolicyVisibilityFlag(VISIBLE_FOR_USER);

            return false;

        }