diff options
| author | 2022-05-12 17:45:03 +0000 | |
|---|---|---|
| committer | 2022-05-12 17:45:03 +0000 | |
| commit | 92b65722f89891fdd82b53478c3631a07d6d54c7 (patch) | |
| tree | a7b7f8976a0bd4639e2f0990c836a35882fbd164 | |
| parent | a73217ec1507278f6b3a7f56c90665b34ee6daf2 (diff) | |
| parent | 6a69a2c8449cd6d1ca5baa6c0956b4086f9c50ee (diff) | |
Merge "Don't require awakeKeyguard for activeUnlock" into tm-dev am: 6a69a2c844
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186409
Change-Id: I0ebd58370be598bc2b17f0d634604ec5b582f1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java | 5 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java index 804d14681812..12fa401d7fea 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java @@ -71,13 +71,16 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView> public void onTrustGrantedWithFlags(int flags, int userId) { if (userId != KeyguardUpdateMonitor.getCurrentUser()) return; boolean bouncerVisible = mView.isVisibleToUser(); + boolean temporaryAndRenewable = + (flags & TrustAgentService.FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE) + != 0; boolean initiatedByUser = (flags & TrustAgentService.FLAG_GRANT_TRUST_INITIATED_BY_USER) != 0; boolean dismissKeyguard = (flags & TrustAgentService.FLAG_GRANT_TRUST_DISMISS_KEYGUARD) != 0; if (initiatedByUser || dismissKeyguard) { - if (mViewMediatorCallback.isScreenOn() + if ((mViewMediatorCallback.isScreenOn() || temporaryAndRenewable) && (bouncerVisible || dismissKeyguard)) { if (!bouncerVisible) { // The trust agent dismissed the keyguard without the user proving diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 7df3b69667bb..98f3d946256f 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -2437,7 +2437,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab // Triggers: final boolean triggerActiveUnlockForAssistant = shouldTriggerActiveUnlockForAssistant(); final boolean awakeKeyguard = mBouncerFullyShown || mUdfpsBouncerShowing - || (mKeyguardIsVisible && mDeviceInteractive && !mGoingToSleep + || (mKeyguardIsVisible && !mGoingToSleep && mStatusBarState != StatusBarState.SHADE_LOCKED); // Gates: |