Merge "MSIM: Fix to show PUK view when two sims locked on PIN." (98eb4a23) · Commits · e / os / android_frameworks_base

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -57,16 +57,16 @@ public class KeyguardSecurityModel {
		SecurityMode getSecurityMode(int userId) {
		KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);

		if (SubscriptionManager.isValidSubscriptionId(
		monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED))) {
		return SecurityMode.SimPin;
		}

		if (mIsPukScreenAvailable && SubscriptionManager.isValidSubscriptionId(
		monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED))) {
		return SecurityMode.SimPuk;
		}

		if (SubscriptionManager.isValidSubscriptionId(
		monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED))) {
		return SecurityMode.SimPin;
		}

		final int security = mLockPatternUtils.getActivePasswordQuality(userId);
		switch (security) {
		case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC: