diff options
| author | 2023-04-19 19:55:01 +0000 | |
|---|---|---|
| committer | 2023-04-19 19:55:01 +0000 | |
| commit | 406e60c8bd2bca0303e6fe75bff1adec8edaceac (patch) | |
| tree | b32b03cb4660eadddb2fb1ad537940c74042db31 | |
| parent | 968b563127f75b84d4da78f9d1182aba20d46db1 (diff) | |
| parent | f2e055c7352567b820af56f0a455884a42b78469 (diff) | |
Merge changes from topic "cherrypicker-L22000000959901080:N28400001357657640" into sc-qpr1-dev am: 7fdc711ced am: cf8dcd2832 am: f2e055c735
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621774
Change-Id: Ifc832b2d9a449a1623c5aec2a03810bdc3292efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java index 19a2d9ed5b7b..3f876ca401cb 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java @@ -452,7 +452,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard case SimPuk: // Shortcut for SIM PIN/PUK to go to directly to user's security screen or home SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId); - if (securityMode == SecurityMode.None && mLockPatternUtils.isLockScreenDisabled( + if (securityMode == SecurityMode.None || mLockPatternUtils.isLockScreenDisabled( KeyguardUpdateMonitor.getCurrentUser())) { finish = true; eventSubtype = BOUNCER_DISMISS_SIM; |