| commit | bf72db3f27475887f70d6ff7407c97f5e4155727 | [log] [tgz] |
|---|---|---|
| author | Bill Lin <lbill@google.com> | Wed Aug 02 01:18:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 02 01:18:01 2023 +0000 |
| tree | be19ec0d7e3e942753ac7daccbe8b589749c7a9f | |
| parent | 7b594fef6a939a0c6fa83ed0ca9309de46875a9c [diff] | |
| parent | f606be3f35a7f90814340af957c4425060423029 [diff] |
Merge "Disable recent only when face enrolled and secure applications launched" into udc-qpr-dev am: f606be3f35 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24204245 Change-Id: I5d388eba9d3df705bd0ad28b7a924cb49c358c3e 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 40fb1fb..e2929ae 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -3285,7 +3285,8 @@ flags |= StatusBarManager.DISABLE_RECENT; } - if (mPowerGestureIntercepted && mOccluded && isSecure()) { + if (mPowerGestureIntercepted && mOccluded && isSecure() + && mUpdateMonitor.isFaceEnrolled()) { flags |= StatusBarManager.DISABLE_RECENT; }