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

Merge "MSIM: Fix to show PUK view when two sims locked on PIN."

Browse Source 
am: 00644ec5cc

Change-Id: Ic0b0927a52f2734cccff6f977aa0dfe9cd6e8d5c
This commit is contained in:
Pengquan Meng
2017-10-12 18:26:47 +00:00
committed by android-build-merger
parent bad318fc93 00644ec5cc
commit 98eb4a23b5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityModel.java
View File

@@ -57,16 +57,16 @@ public class KeyguardSecurityModel {
SecurityMode getSecurityMode(int userId) { SecurityMode getSecurityMode(int userId) {
KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext); KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);
if (SubscriptionManager.isValidSubscriptionId(
monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED))) {
return SecurityMode.SimPin;
}
if (mIsPukScreenAvailable && SubscriptionManager.isValidSubscriptionId( if (mIsPukScreenAvailable && SubscriptionManager.isValidSubscriptionId(
monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED))) { monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED))) {
return SecurityMode.SimPuk; return SecurityMode.SimPuk;
} }
if (SubscriptionManager.isValidSubscriptionId(
monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED))) {
return SecurityMode.SimPin;
}
final int security = mLockPatternUtils.getActivePasswordQuality(userId); final int security = mLockPatternUtils.getActivePasswordQuality(userId);
switch (security) { switch (security) {
case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC: case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC: