diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-14 23:31:07 +0000 |
|---|---|---|
| committer | Justin Dunlap <justindunlap@google.com> | 2023-09-01 12:53:11 -0700 |
| commit | 8668fcd1dc8f2aec52d257b0766fd1eeb182e4ff (patch) | |
| tree | d6cc22bf4af137bd9d27ef6a2a29d8cc2edeadd1 | |
| parent | 2f91627a8be94845a4e7c3c1a5b08ce72543a17c (diff) | |
| parent | 146b2fd9b0a6a3b15102d65264e5db7a28b09793 (diff) | |
| download | base-8668fcd1dc8f2aec52d257b0766fd1eeb182e4ff.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24405933'] into security-aosp-sc-release.android-security-12.0.0_r52
Change-Id: Id79c57541361f9e80b812e4e9319439b64e24369
| -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 9a3a6abc3646..fc9c5dddbee5 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java @@ -391,7 +391,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; |