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

Merge "Dismiss SIM lock page after correct SIM"

Browse Source 
am: eb1d6d91af

Change-Id: I01551d9d8e14e7a9bd4ef5178b571beee032735b
This commit is contained in:
Jordan Liu
2018-09-26 17:09:44 -07:00
committed by android-build-merger
parent 47be78e523 eb1d6d91af
commit 737945fbd5
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
View File

@@ -342,12 +342,11 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
case SimPuk: case SimPuk:
// Shortcut for SIM PIN/PUK to go to directly to user's security screen or home // Shortcut for SIM PIN/PUK to go to directly to user's security screen or home
SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId); SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);
if (securityMode != SecurityMode.None if (securityMode == SecurityMode.None || mLockPatternUtils.isLockScreenDisabled(
|| !mLockPatternUtils.isLockScreenDisabled(
KeyguardUpdateMonitor.getCurrentUser())) { KeyguardUpdateMonitor.getCurrentUser())) {
showSecurityScreen(securityMode);
} else {
finish = true; finish = true;
} else {
showSecurityScreen(securityMode);
} }
break; break;