diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-14 23:32:15 +0000 |
|---|---|---|
| committer | Justin Dunlap <justindunlap@google.com> | 2023-09-01 12:58:53 -0700 |
| commit | 08f9c38373848953f04f73f77d4e7aaa441e3421 (patch) | |
| tree | a231256df86401dc82d714cbefeafa4ce7a7b1e9 | |
| parent | 035ae46e65b86e91ce40f6a7fe8776e4be47853b (diff) | |
| parent | 3467e6cb598f58c66fe01be7e7d8d26b556eadcc (diff) | |
| download | base-08f9c38373848953f04f73f77d4e7aaa441e3421.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24405148'] into security-aosp-tm-release.android-security-13.0.0_r10
Change-Id: I5936507b5ddfcb6a6190b295fa1ec0b8d9f0db19
| -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 0309d212e03f..2b9553d3eda2 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java @@ -469,7 +469,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; |