Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add restricted card state to telephony manager." into nyc-mr1-dev

Browse Source
This commit is contained in:
Junda Liu
2016-05-25 21:39:10 +00:00
committed by Android (Google) Code Review
parent f2c95b865e a2f6a67511
commit ea97857a78
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,6 +217,8 @@ public class PhoneStatusBarPolicy implements Callback, RotationLockController.Ro
mSimState = IccCardConstants.State.ABSENT; mSimState = IccCardConstants.State.ABSENT;
} else if (IccCardConstants.INTENT_VALUE_ICC_CARD_IO_ERROR.equals(stateExtra)) { } else if (IccCardConstants.INTENT_VALUE_ICC_CARD_IO_ERROR.equals(stateExtra)) {
mSimState = IccCardConstants.State.CARD_IO_ERROR; mSimState = IccCardConstants.State.CARD_IO_ERROR;
} else if (IccCardConstants.INTENT_VALUE_ICC_CARD_RESTRICTED.equals(stateExtra)) {
mSimState = IccCardConstants.State.CARD_RESTRICTED;
} else if (IccCardConstants.INTENT_VALUE_ICC_READY.equals(stateExtra)) { } else if (IccCardConstants.INTENT_VALUE_ICC_READY.equals(stateExtra)) {
mSimState = IccCardConstants.State.READY; mSimState = IccCardConstants.State.READY;
} else if (IccCardConstants.INTENT_VALUE_ICC_LOCKED.equals(stateExtra)) { } else if (IccCardConstants.INTENT_VALUE_ICC_LOCKED.equals(stateExtra)) {

5
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -1730,6 +1730,11 @@ public class TelephonyManager {
*@hide *@hide
*/ */
public static final int SIM_STATE_CARD_IO_ERROR = 8; public static final int SIM_STATE_CARD_IO_ERROR = 8;
/** SIM card state: SIM Card restricted, present but not usable due to
* carrier restrictions.
*@hide
*/
public static final int SIM_STATE_CARD_RESTRICTED = 9;
/** /**
* @return true if a ICC card is present * @return true if a ICC card is present

9
telephony/java/com/android/internal/telephony/IccCardConstants.java
View File

@@ -32,6 +32,8 @@ public class IccCardConstants {
public static final String INTENT_VALUE_ICC_ABSENT = "ABSENT"; public static final String INTENT_VALUE_ICC_ABSENT = "ABSENT";
/* CARD_IO_ERROR means for three consecutive times there was SIM IO error */ /* CARD_IO_ERROR means for three consecutive times there was SIM IO error */
static public final String INTENT_VALUE_ICC_CARD_IO_ERROR = "CARD_IO_ERROR"; static public final String INTENT_VALUE_ICC_CARD_IO_ERROR = "CARD_IO_ERROR";
/* CARD_RESTRICTED means card is present but not usable due to carrier restrictions */
static public final String INTENT_VALUE_ICC_CARD_RESTRICTED = "CARD_RESTRICTED";
/* LOCKED means ICC is locked by pin or by network */ /* LOCKED means ICC is locked by pin or by network */
public static final String INTENT_VALUE_ICC_LOCKED = "LOCKED"; public static final String INTENT_VALUE_ICC_LOCKED = "LOCKED";
//TODO: we can remove this state in the future if Bug 18489776 analysis //TODO: we can remove this state in the future if Bug 18489776 analysis
@@ -74,7 +76,8 @@ public class IccCardConstants {
READY, /** ordinal(5) == {@See TelephonyManager#SIM_STATE_READY} */ READY, /** ordinal(5) == {@See TelephonyManager#SIM_STATE_READY} */
NOT_READY, /** ordinal(6) == {@See TelephonyManager#SIM_STATE_NOT_READY} */ NOT_READY, /** ordinal(6) == {@See TelephonyManager#SIM_STATE_NOT_READY} */
PERM_DISABLED, /** ordinal(7) == {@See TelephonyManager#SIM_STATE_PERM_DISABLED} */ PERM_DISABLED, /** ordinal(7) == {@See TelephonyManager#SIM_STATE_PERM_DISABLED} */
CARD_IO_ERROR; /** ordinal(8) == {@See TelephonyManager#SIM_STATE_CARD_IO_ERROR} */ CARD_IO_ERROR, /** ordinal(8) == {@See TelephonyManager#SIM_STATE_CARD_IO_ERROR} */
CARD_RESTRICTED;/** ordinal(9) == {@See TelephonyManager#SIM_STATE_CARD_RESTRICTED} */
public boolean isPinLocked() { public boolean isPinLocked() {
return ((this == PIN_REQUIRED) || (this == PUK_REQUIRED)); return ((this == PIN_REQUIRED) || (this == PUK_REQUIRED));
@@ -83,7 +86,8 @@ public class IccCardConstants {
public boolean iccCardExist() { public boolean iccCardExist() {
return ((this == PIN_REQUIRED) || (this == PUK_REQUIRED) return ((this == PIN_REQUIRED) || (this == PUK_REQUIRED)
|| (this == NETWORK_LOCKED) || (this == READY) || (this == NETWORK_LOCKED) || (this == READY)
|| (this == PERM_DISABLED) || (this == CARD_IO_ERROR)); || (this == PERM_DISABLED) || (this == CARD_IO_ERROR)
|| (this == CARD_RESTRICTED));
} }
public static State intToState(int state) throws IllegalArgumentException { public static State intToState(int state) throws IllegalArgumentException {
@@ -97,6 +101,7 @@ public class IccCardConstants {
case 6: return NOT_READY; case 6: return NOT_READY;
case 7: return PERM_DISABLED; case 7: return PERM_DISABLED;
case 8: return CARD_IO_ERROR; case 8: return CARD_IO_ERROR;
case 9: return CARD_RESTRICTED;
default: default:
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }