Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "cherrypicker-L22000000959901080:N28400001357657640" into sc-qpr1-dev

Browse Source 
* changes:
  [automerge] Dismiss keyguard when simpin auth'd and... 2p: 65ea56f54c
  Dismiss keyguard when simpin auth'd and...
This commit is contained in:
Aaron Liu
2023-04-19 17:29:48 +00:00
committed by Android (Google) Code Review
parent d0f9d22662 929703119b
commit 7fdc711ced
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
View File

@@ -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;