Merge "Make the condition of DISABLE_RECENT more robust in launch GCA CUJ" into udc-dev am: 3875579dd3 am: 4004a8df8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23491617 Change-Id: Ie79d20b5ea91200a7b0353238b1df57a89a3312a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1943,7 +1943,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
|
|||||||
startKeyguardExitAnimation(0, 0);
|
startKeyguardExitAnimation(0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
mPowerGestureIntercepted = mUpdateMonitor.isSecureCameraLaunchedOverKeyguard();
|
mPowerGestureIntercepted =
|
||||||
|
isOccluded && mUpdateMonitor.isSecureCameraLaunchedOverKeyguard();
|
||||||
|
|
||||||
if (mOccluded != isOccluded) {
|
if (mOccluded != isOccluded) {
|
||||||
mOccluded = isOccluded;
|
mOccluded = isOccluded;
|
||||||
|
|||||||
Reference in New Issue
Block a user