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

Commit 178c11b5 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Stop calling #setOccluded when WM shell is enabled." into... 

Merge "Merge "Stop calling #setOccluded when WM shell is enabled." into tm-qpr-dev am: 69dbf9ff" into tm-qpr-dev-plus-aosp am: ba3bbb60

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



Change-Id: I7bb0276cd21d7b87da6f36a2c34741616944600a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2bf9cd94 ba3bbb60

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

+1 −2
Original line number Diff line number Diff line
@@ -3258,8 +3258,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


    @Override

    public void onKeyguardOccludedChangedLw(boolean occluded) {

        if (mKeyguardDelegate != null && mKeyguardDelegate.isShowing()

                && !WindowManagerService.sEnableShellTransitions) {

        if (mKeyguardDelegate != null && mKeyguardDelegate.isShowing()) {

            mPendingKeyguardOccluded = occluded;

            mKeyguardOccludedChanged = true;

        } else {