Merge "Telephony: Add ME Depersonalization support." (8f45e529) · Commits · e / os / android_frameworks_base

packages/Keyguard/res/values/strings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,10 @@
		<!-- SIM messages --><skip />
		<!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
		<string name="keyguard_network_locked_message">Network locked</string>

		<!-- When the user inserts a sim card with some personalization enabled -->
		<string name="keyguard_perso_locked_message">SIM/RUIM is Perso locked</string>

		<!-- Shown when there is no SIM card. -->
		<string name="keyguard_missing_sim_message_short">No SIM card</string>
		<!-- Shown when there is no SIM card. -->

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ public class CarrierText extends TextView {
		*/
		private static enum StatusMode {
		Normal, // Normal case (sim card present, it's not locked)
		NetworkLocked, // SIM card is 'network locked'.
		PersoLocked, // SIM card is 'perso locked'.
		SimMissing, // SIM card is missing.
		SimMissingLocked, // SIM card is missing, and device isn't provisioned; don't allow access
		SimPukLocked, // SIM card is PUK locked because SIM entered wrong too many times
		@@ -131,9 +131,9 @@ public class CarrierText extends TextView {
		carrierText = null; // nothing to display yet.
		break;

		case NetworkLocked:
		case PersoLocked:
		carrierText = makeCarrierStringOnEmergencyCapable(
		mContext.getText(R.string.keyguard_network_locked_message), plmn);
		getContext().getText(R.string.keyguard_perso_locked_message), plmn);
		break;

		case SimMissing:
		@@ -204,13 +204,13 @@ public class CarrierText extends TextView {
		&& (simState == IccCardConstants.State.ABSENT \|\|
		simState == IccCardConstants.State.PERM_DISABLED);

		// Assume we're NETWORK_LOCKED if not provisioned
		simState = missingAndNotProvisioned ? IccCardConstants.State.NETWORK_LOCKED : simState;
		// Assume we're PERSO_LOCKED if not provisioned
		simState = missingAndNotProvisioned ? IccCardConstants.State.PERSO_LOCKED : simState;
		switch (simState) {
		case ABSENT:
		return StatusMode.SimMissing;
		case NETWORK_LOCKED:
		return StatusMode.SimMissingLocked;
		case PERSO_LOCKED:
		return StatusMode.PersoLocked;
		case NOT_READY:
		return StatusMode.SimNotReady;
		case PIN_REQUIRED:
		@@ -248,7 +248,7 @@ public class CarrierText extends TextView {
		int carrierHelpTextId = 0;
		StatusMode status = getStatusForIccState(simState);
		switch (status) {
		case NetworkLocked:
		case PersoLocked:
		carrierHelpTextId = R.string.keyguard_instructions_when_pattern_disabled;
		break;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -368,13 +368,13 @@ public class KeyguardUpdateMonitor {
		state = IccCardConstants.State.PIN_REQUIRED;
		} else if (IccCardConstants.INTENT_VALUE_LOCKED_ON_PUK.equals(lockedReason)) {
		state = IccCardConstants.State.PUK_REQUIRED;
		} else if (IccCardConstants.INTENT_VALUE_LOCKED_PERSO.equals(stateExtra)) {
		state = IccCardConstants.State.PERSO_LOCKED;
		} else {
		state = IccCardConstants.State.UNKNOWN;
		}
		} else if (IccCardConstants.INTENT_VALUE_ICC_CARD_IO_ERROR.equals(stateExtra)) {
		state = IccCardConstants.State.CARD_IO_ERROR;
		} else if (IccCardConstants.INTENT_VALUE_LOCKED_NETWORK.equals(stateExtra)) {
		state = IccCardConstants.State.NETWORK_LOCKED;
		} else if (IccCardConstants.INTENT_VALUE_ICC_LOADED.equals(stateExtra)
		\|\| IccCardConstants.INTENT_VALUE_ICC_IMSI.equals(stateExtra)) {
		// This is required because telephony doesn't return to "READY" after

packages/Keyguard/src/com/android/keyguard/msim/MSimKeyguardSimPinView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ public class MSimKeyguardSimPinView extends KeyguardSimPinView {
		if (simState == IccCardConstants.State.READY \|\|
		simState == IccCardConstants.State.PIN_REQUIRED \|\|
		simState == IccCardConstants.State.PUK_REQUIRED \|\|
		simState == IccCardConstants.State.NETWORK_LOCKED) {
		simState == IccCardConstants.State.PERSO_LOCKED) {
		numCardsConfigured++;
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -200,7 +200,7 @@ public class PhoneStatusBarPolicy {
		simState = IccCardConstants.State.PUK_REQUIRED;
		}
		else {
		simState = IccCardConstants.State.NETWORK_LOCKED;
		simState = IccCardConstants.State.PERSO_LOCKED;
		}
		} else {
		simState = IccCardConstants.State.UNKNOWN;