diff options
| author | Beena More <bmore@codeaurora.org> | 2015-08-20 11:56:47 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:28:19 -0600 |
| commit | 1a37b5341a0b31994bdc6d30a71a904085922a6e (patch) | |
| tree | 5238625c2e5a676cf1555e1f690d8e2d8b4d427f | |
| parent | 2f7270f2add532423ba4afe14518a24fdc32d7a0 (diff) | |
| download | frameworks_base-1a37b5341a0b31994bdc6d30a71a904085922a6e.zip frameworks_base-1a37b5341a0b31994bdc6d30a71a904085922a6e.tar.gz frameworks_base-1a37b5341a0b31994bdc6d30a71a904085922a6e.tar.bz2 | |
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
3 files changed, 6 insertions, 4 deletions
diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml index 25a3e6e..4837911 100644 --- a/packages/Keyguard/res/values/strings.xml +++ b/packages/Keyguard/res/values/strings.xml @@ -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. --> diff --git a/packages/Keyguard/src/com/android/keyguard/CarrierText.java b/packages/Keyguard/src/com/android/keyguard/CarrierText.java index 370bb9c..416c7b0 100644 --- a/packages/Keyguard/src/com/android/keyguard/CarrierText.java +++ b/packages/Keyguard/src/com/android/keyguard/CarrierText.java @@ -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: diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index df7f893..2f00bb1 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -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) |