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

Commit 9213632d 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/24404812']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24404812'] into security-aosp-rvc-release.

Change-Id: Icffdd140d30b7c9e990a6972f28c6694b4528b30
parents 87d745d5 8af883d6

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

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe 
                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;