diff options
| author | 2023-03-28 13:15:04 -0700 | |
|---|---|---|
| committer | 2023-04-17 18:59:05 +0000 | |
| commit | 65ea56f54c059584eb27ec53d486dba8161316ab (patch) | |
| tree | 69f7319549da18fc794dc3cbdbe9ab9873c10df5 | |
| parent | b1cc81c36514df527efdb25b6adc3cb471e7c77a (diff) | |
Dismiss keyguard when simpin auth'd and...
security method is none. This is mostly to fix the case where we auth
sim pin in the set up wizard and it goes straight to keyguard instead of
the setup wizard activity.
This works with the prevent bypass keyguard flag because the device
should be noe secure in this case.
Fixes: 222446076
Test: turn locked sim on, which opens the sim pin screen. Auth the
screen and observe that keyguard is not shown.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:48fa9bef3451e4a358c941af5b230f99881c5cb6)
Merged-In: Ib2d5400e930fa4d6f7f98e46f32a290ba5f558f4
Change-Id: Ib2d5400e930fa4d6f7f98e46f32a290ba5f558f4
Cherry-picking this CL as a security fix
Bug: 222446076
Change-Id: Id302c41f63028bc6dd58ba686e23d73565de9675
| -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 fc9c5dddbee5..9a3a6abc3646 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; |