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

Merge "Make the condition of DISABLE_RECENT more robust in launch GCA CUJ" into udc-dev am: 3875579dd3 am: 4004a8df8b am: 1433b44389

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

Change-Id: I5ea7df1224af05c9c77d45f9a2a99af6eb8df487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bill Lin
2023-06-02 14:48:45 +00:00
committed by Automerger Merge Worker
parent 84bc78649d 1433b44389
commit 8d6ae116f7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -1954,7 +1954,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
startKeyguardExitAnimation(0, 0);
}
mPowerGestureIntercepted = mUpdateMonitor.isSecureCameraLaunchedOverKeyguard();
mPowerGestureIntercepted =
isOccluded && mUpdateMonitor.isSecureCameraLaunchedOverKeyguard();
if (mOccluded != isOccluded) {
mOccluded = isOccluded;