Remove some useless code in KeyguardUpdateMonitor. (7553b921) · Commits · e / os / android_frameworks_base

packages/Keyguard/src/com/android/keyguard/EmergencyButton.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ public class EmergencyButton extends Button {
		if (mLockPatternUtils.isInCall()) {
		enabled = true; // always show "return to call" if phone is off-hook
		} else if (mLockPatternUtils.isEmergencyCallCapable()) {
		boolean simLocked = KeyguardUpdateMonitor.getInstance(mContext).isSimLocked();
		boolean simLocked = KeyguardUpdateMonitor.getInstance(mContext).isSimPinVoiceSecure();
		if (simLocked) {
		// Some countries can't handle emergency calls while SIM is locked.
		enabled = mLockPatternUtils.isEmergencyCallEnabledWhileSimLocked();

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

+6 −12

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.keyguard;
		import android.app.Profile;
		import android.app.admin.DevicePolicyManager;
		import android.content.Context;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;

		import com.android.internal.telephony.IccCardConstants;
		@@ -76,21 +77,14 @@ public class KeyguardSecurityModel {
		}

		SecurityMode getSecurityMode() {
		KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
		IccCardConstants.State simState = IccCardConstants.State.UNKNOWN;
		KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);
		SecurityMode mode = SecurityMode.None;
		for (int i = 0; i < updateMonitor.getNumPhones(); i++) {
		int subId = updateMonitor.getSubIdByPhoneId(i);
		simState = updateMonitor.getSimState(subId);
		if (simState == IccCardConstants.State.PIN_REQUIRED
		\|\| simState == IccCardConstants.State.PUK_REQUIRED) {
		break;
		}
		}

		if (simState == IccCardConstants.State.PIN_REQUIRED) {
		if (SubscriptionManager.isValidSubscriptionId(
		monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED))) {
		mode = SecurityMode.SimPin;
		} else if (simState == IccCardConstants.State.PUK_REQUIRED
		} else if (SubscriptionManager.isValidSubscriptionId(
		monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED))
		&& mLockPatternUtils.isPukUnlockScreenEnable()) {
		mode = SecurityMode.SimPuk;
		} else {

packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {

		mSubNameView = (TextView) findViewById(R.id.sim_name);
		mSimImageView = (ImageView) findViewById(R.id.keyguard_sim);
		mSubId = mKgUpdateMonitor.getSimPinLockSubId();
		mSubId = mKgUpdateMonitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED);
		if (mKgUpdateMonitor.getNumPhones() > 1) {
		mSubNameView.setVisibility(View.VISIBLE);
		handleSubInfoChange();
		@@ -343,7 +343,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
		}

		private void handleSubInfoChangeIfNeeded() {
		int subId = mKgUpdateMonitor.getSimPinLockSubId();
		int subId = mKgUpdateMonitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED);
		if (subId != mSubId && SubscriptionManager.isValidSubscriptionId(subId)) {
		mSubId = subId;
		handleSubInfoChange();

packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -203,7 +203,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {

		mSubNameView = (TextView) findViewById(R.id.sim_name);
		mSimImageView = (ImageView) findViewById(R.id.keyguard_sim);
		mSubId = mKgUpdateMonitor.getSimPukLockSubId();
		mSubId = mKgUpdateMonitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED);
		if (mKgUpdateMonitor.getNumPhones() > 1) {
		mSubNameView.setVisibility(View.VISIBLE);
		handleSubInfoChange();
		@@ -410,7 +410,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {
		}

		private void handleSubInfoChangeIfNeeded() {
		int subId = mKgUpdateMonitor.getSimPukLockSubId();
		int subId = mKgUpdateMonitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED);
		if (subId != mSubId && SubscriptionManager.isValidSubscriptionId(subId)) {
		mSubId = subId;
		handleSubInfoChange();

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+16 −79

Original line number	Diff line number	Diff line
		@@ -1558,39 +1558,24 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		mAlternateUnlockEnabled = enabled;
		}

		public boolean isSimLocked() {
		boolean bSimLocked = false;
		for (int slotId = 0; slotId < mSubIdForSlot.length; slotId++) {
		if (isSimLocked(mSimState.get(slotId))) {
		bSimLocked = true;
		break;
		}
		}
		return bSimLocked;
		}

		public static boolean isSimLocked(IccCardConstants.State state) {
		return state == IccCardConstants.State.PIN_REQUIRED
		\|\| state == IccCardConstants.State.PUK_REQUIRED
		\|\| state == IccCardConstants.State.PERM_DISABLED;
		}

		public boolean isSimPinSecure() {
		boolean isSecure = false;
		for (int slotId = 0; slotId < mSubIdForSlot.length; slotId++) {
		if (isSimPinSecure(mSimState.get(slotId))) {
		isSecure = true;
		break;
		return true;
		}
		}
		return false;
		}
		return isSecure;

		public boolean isSimPinVoiceSecure() {
		// TODO: only count SIMs that handle voice
		return isSimPinSecure();
		}

		public static boolean isSimPinSecure(IccCardConstants.State state) {
		final IccCardConstants.State simState = state;
		return (simState == IccCardConstants.State.PIN_REQUIRED
		\|\| simState == IccCardConstants.State.PUK_REQUIRED
		\|\| simState == IccCardConstants.State.PERM_DISABLED);
		return state == IccCardConstants.State.PIN_REQUIRED
		\|\| state == IccCardConstants.State.PUK_REQUIRED
		\|\| state == IccCardConstants.State.PERM_DISABLED;
		}

		public DisplayClientState getCachedDisplayClientState() {
		@@ -1617,34 +1602,16 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		return mScreenOn;
		}

		//return subId of first SIM that is PIN locked.
		public int getSimPinLockSubId() {
		int currentSimPinSubId = INVALID_SUBID;
		for (int slotId = 0; slotId < mSubIdForSlot.length; slotId++) {
		if (DEBUG) Log.d(TAG, "getSimPinLockSubId, slotId = " + slotId
		+ ", subId = "+ mSubIdForSlot[slotId]
		+ ", SimState = " + mSimState.get(slotId));
		if (mSimState.get(slotId) == IccCardConstants.State.PIN_REQUIRED) {
		currentSimPinSubId = mSubIdForSlot[slotId];
		break;
		}
		}
		return currentSimPinSubId;
		}

		//return subId of first SIM that is PUK locked.
		public int getSimPukLockSubId() {
		int currentSimPukSubId = INVALID_SUBID;
		public int getNextSubIdForState(State state) {
		for (int slotId = 0; slotId < mSubIdForSlot.length; slotId++) {
		if (DEBUG) Log.d(TAG, "getSimPukLockSubId, slotId = " + slotId
		if (DEBUG) Log.d(TAG, "getNextSubIdForState, slotId = " + slotId
		+ ", subId = "+ mSubIdForSlot[slotId]
		+ ", SimState = " + mSimState.get(slotId));
		if (mSimState.get(slotId) == IccCardConstants.State.PUK_REQUIRED) {
		currentSimPukSubId = mSubIdForSlot[slotId];
		break;
		+ ", simState = " + mSimState.get(slotId));
		if (mSimState.get(slotId) == state) {
		return mSubIdForSlot[slotId];
		}
		}
		return currentSimPukSubId;
		return INVALID_SUBID;
		}

		public int getNumPhones() {
		@@ -1653,34 +1620,4 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		}
		return mNumPhones;
		}

		public boolean isValidPhoneId(int phoneId) {
		if ((0 <= phoneId) && (phoneId < mNumPhones)) {
		return true;
		} else {
		return false;
		}
		}

		public int getPhoneIdBySubId(int subId) {
		int phoneId = -1;
		if (subId != INVALID_SUBID) {
		for (int i = 0; i < getNumPhones(); i++) {
		if (mSubIdForSlot[i] == subId) {
		phoneId = i;
		break;
		}
		}
		}
		return phoneId;
		}

		public int getSubIdByPhoneId(int phoneId) {
		int subId = INVALID_SUBID;
		if (isValidPhoneId(phoneId)) {
		subId = mSubIdForSlot[phoneId];
		}
		return subId;
		}

		}