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

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

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

Change-Id: Ib2767dbeb996e6ff46fba0a39988a9e8dbe5e5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Issei Suzuki
2022-08-23 20:52:16 +00:00
committed by Automerger Merge Worker
parent 04e7dc8c62 69dbf9ff31
commit a112193789
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 {