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

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

Change-Id: I78db1b663cd36e13d38242657e9eebb4834843ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bill Lin
2023-06-01 16:03:42 +00:00
committed by Automerger Merge Worker
parent 5be59db93e 3875579dd3
commit 1fd9332c55
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

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