Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a37b534 authored Aug 20, 2015 by Beena More Committed by Linux Build Service Account Oct 06, 2015

Telephony: SIM De-personalization

1. Support for all ME De-Personalizations as per specs
   3GPP2 C.S0068-0 and 3GPP TS 22.022
2. Changes for Perso locked display messages

Change-Id: I20585dac214309c62efd78fb611d27b3bb7996ce

parent 2f7270f2

packages/Keyguard/res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,8 @@
		<!-- 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 card 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

+2 −2

Original line number	Diff line number	Diff line
		@@ -244,7 +244,7 @@ public class CarrierText extends TextView {

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

		case SimMissing:
		@@ -312,7 +312,7 @@ public class CarrierText extends TextView {
		case ABSENT:
		return StatusMode.SimMissing;
		case NETWORK_LOCKED:
		return StatusMode.SimMissingLocked;
		return StatusMode.NetworkLocked;
		case NOT_READY:
		return StatusMode.SimNotReady;
		case PIN_REQUIRED:

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -697,11 +697,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
		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_NETWORK.equals(lockedReason)) {
		state = IccCardConstants.State.NETWORK_LOCKED;
		} else {
		state = IccCardConstants.State.UNKNOWN;
		}
		} else if (IccCardConstants.INTENT_VALUE_LOCKED_NETWORK.equals(stateExtra)) {
		state = IccCardConstants.State.NETWORK_LOCKED;
		} else if (IccCardConstants.INTENT_VALUE_ICC_CARD_IO_ERROR.equals(stateExtra)) {
		state = IccCardConstants.State.CARD_IO_ERROR;
		} else if (IccCardConstants.INTENT_VALUE_ICC_LOADED.equals(stateExtra)