| commit | f56bebdbdfbe66abea67631e55420f1a46606ecd | [log] [tgz] |
|---|---|---|
| author | Bill Lin <lbill@google.com> | Wed Aug 02 02:02:42 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 02 02:02:42 2023 +0000 |
| tree | cb5df5d464c06193d720956e37a7c1abfa3160ac | |
| parent | 3e40c03cac6fac7fb1b32e4a3be4a538d5b108e3 [diff] | |
| parent | bf72db3f27475887f70d6ff7407c97f5e4155727 [diff] |
Merge "Disable recent only when face enrolled and secure applications launched" into udc-qpr-dev am: f606be3f35 am: bf72db3f27 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24204245 Change-Id: I978740bf4832854f62c27198dc546eadf959f9f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 2686233..66de371 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -3291,7 +3291,8 @@ flags |= StatusBarManager.DISABLE_RECENT; } - if (mPowerGestureIntercepted && mOccluded && isSecure()) { + if (mPowerGestureIntercepted && mOccluded && isSecure() + && mUpdateMonitor.isFaceEnrolled()) { flags |= StatusBarManager.DISABLE_RECENT; }