diff options
| author | Wink Saville <wink@google.com> | 2014-04-26 00:28:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-26 00:28:56 +0000 |
| commit | ae166fe9e074de30c24f5bd567f6404b50cd9cfa (patch) | |
| tree | 7534bd1630024bcd6435517945369488bec26035 /telephony | |
| parent | 66fbe3dc81f2786b2be9afa122038228a31e2cdb (diff) | |
| parent | c79963c3cb6d0127e2fc9ce5bf000fa05811504d (diff) | |
| download | frameworks_base-ae166fe9e074de30c24f5bd567f6404b50cd9cfa.zip frameworks_base-ae166fe9e074de30c24f5bd567f6404b50cd9cfa.tar.gz frameworks_base-ae166fe9e074de30c24f5bd567f6404b50cd9cfa.tar.bz2 | |
am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit 'c79963c3cb6d0127e2fc9ce5bf000fa05811504d':
Telephony: Add functionality to handle ICC IO error
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 8 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/IccCardConstants.java | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index d5c7caa..407a8d1 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1094,6 +1094,10 @@ public class TelephonyManager { public static final int SIM_STATE_NETWORK_LOCKED = 4; /** SIM card state: Ready */ public static final int SIM_STATE_READY = 5; + /** SIM card state: SIM Card Error, Sim Card is present but faulty + *@hide + */ + public static final int SIM_STATE_CARD_IO_ERROR = 6; /** * @return true if a ICC card is present @@ -1120,6 +1124,7 @@ public class TelephonyManager { * @see #SIM_STATE_PUK_REQUIRED * @see #SIM_STATE_NETWORK_LOCKED * @see #SIM_STATE_READY + * @see #SIM_STATE_CARD_IO_ERROR */ public int getSimState() { String prop = SystemProperties.get(TelephonyProperties.PROPERTY_SIM_STATE); @@ -1138,6 +1143,9 @@ public class TelephonyManager { else if ("READY".equals(prop)) { return SIM_STATE_READY; } + else if ("CARD_IO_ERROR".equals(prop)) { + return SIM_STATE_CARD_IO_ERROR; + } else { return SIM_STATE_UNKNOWN; } diff --git a/telephony/java/com/android/internal/telephony/IccCardConstants.java b/telephony/java/com/android/internal/telephony/IccCardConstants.java index 236bb2f..8029713 100644 --- a/telephony/java/com/android/internal/telephony/IccCardConstants.java +++ b/telephony/java/com/android/internal/telephony/IccCardConstants.java @@ -28,6 +28,8 @@ public class IccCardConstants { public static final String INTENT_VALUE_ICC_NOT_READY = "NOT_READY"; /* ABSENT means ICC is missing */ public static final String INTENT_VALUE_ICC_ABSENT = "ABSENT"; + /* 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"; /* LOCKED means ICC is locked by pin or by network */ public static final String INTENT_VALUE_ICC_LOCKED = "LOCKED"; /* READY means ICC is ready to access */ @@ -63,7 +65,8 @@ public class IccCardConstants { NETWORK_LOCKED, READY, NOT_READY, - PERM_DISABLED; + PERM_DISABLED, + CARD_IO_ERROR; public boolean isPinLocked() { return ((this == PIN_REQUIRED) || (this == PUK_REQUIRED)); @@ -72,7 +75,7 @@ public class IccCardConstants { public boolean iccCardExist() { return ((this == PIN_REQUIRED) || (this == PUK_REQUIRED) || (this == NETWORK_LOCKED) || (this == READY) - || (this == PERM_DISABLED)); + || (this == PERM_DISABLED) || (this == CARD_IO_ERROR)); } } } |