Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Automerger Merge Worker
2022-08-23 20:52:42 +00:00
committed by Android (Google) Code Review
parent 97baf93058 a112193789
commit ba3bbb60f9
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -3245,8 +3245,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 {