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

Commit ba2cbd95 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Hold onto occluded change until it's committed" into tm-qpr-dev am: 0cbdbb64 

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



Change-Id: I824ea1f31c2b661e461f7c0cdb081198cdd52ab5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f6abee5 0cbdbb64

services/core/java/com/android/server/policy/PhoneWindowManager.java

+9 −15
Original line number Diff line number Diff line
@@ -3378,8 +3378,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            mPendingKeyguardOccluded = occluded;

            mKeyguardOccludedChanged = true;

        } else {

            setKeyguardOccludedLw(occluded, false /* force */,

                    false /* transitionStarted */);

            setKeyguardOccludedLw(occluded, false /* transitionStarted */);

        }

    }
@@ -3388,8 +3387,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        if (mKeyguardOccludedChanged) {

            if (DEBUG_KEYGUARD) Slog.d(TAG, "transition/occluded changed occluded="

                    + mPendingKeyguardOccluded);

            if (setKeyguardOccludedLw(mPendingKeyguardOccluded, false /* force */,

                    transitionStarted)) {

            if (setKeyguardOccludedLw(mPendingKeyguardOccluded, transitionStarted)) {

                return FINISH_LAYOUT_REDO_LAYOUT | FINISH_LAYOUT_REDO_WALLPAPER;

            }

        }
@@ -3643,22 +3641,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    /**

     * Updates the occluded state of the Keyguard.

     * Updates the occluded state of the Keyguard immediately via

     * {@link com.android.internal.policy.IKeyguardService}.

     *

     * @param isOccluded Whether the Keyguard is occluded by another window.

     * @param force notify the occluded status to KeyguardService and update flags even though

     *             occlude status doesn't change.

     * @param transitionStarted {@code true} if keyguard (un)occluded transition started.

     * @return Whether the flags have changed and we have to redo the layout.

     */

    private boolean setKeyguardOccludedLw(boolean isOccluded, boolean force,

            boolean transitionStarted) {

    private boolean setKeyguardOccludedLw(boolean isOccluded, boolean transitionStarted) {

        if (DEBUG_KEYGUARD) Slog.d(TAG, "setKeyguardOccluded occluded=" + isOccluded);

        mKeyguardOccludedChanged = false;

        if (isKeyguardOccluded() == isOccluded && !force) {

            return false;

        }



        final boolean showing = mKeyguardDelegate.isShowing();

        final boolean animate = showing && !isOccluded;

        // When remote animation is enabled for keyguard (un)occlude transition, KeyguardService
@@ -3666,7 +3657,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        // to notify here.

        final boolean notify = !WindowManagerService.sEnableRemoteKeyguardOccludeAnimation

                || !transitionStarted;

        if (notify) {

            mKeyguardOccludedChanged = false;

            mKeyguardDelegate.setOccluded(isOccluded, animate, notify);

        }

        return showing;

    }