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

Commit ba3bbb60 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
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
parents 97baf930 a1121937

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

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




    @Override

    @Override

    public void onKeyguardOccludedChangedLw(boolean occluded) {

    public void onKeyguardOccludedChangedLw(boolean occluded) {

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

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

                && !WindowManagerService.sEnableShellTransitions) {

            mPendingKeyguardOccluded = occluded;

            mPendingKeyguardOccluded = occluded;

            mKeyguardOccludedChanged = true;

            mKeyguardOccludedChanged = true;

        } else {

        } else {