Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c191825 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker Committed by Justin Dunlap
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24405147']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24405147'] into security-aosp-sc-v2-release.

Change-Id: I39c3c5e7b6cb992b59f1f972f5dc60c1ab359ef5
parents 970e8cc3 8ba76383

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,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;