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

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

Change-Id: I39bfd1b1ed8290051bc970a0309e5a4a68cd91b2
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:40:19 +00:00
committed by Automerger Merge Worker

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;