summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2014-04-26 00:35:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-26 00:35:49 +0000
commit994a9a39b56a6cf7538c1b4254cdd604bc1c2557 (patch)
tree85f7b0af2597dff9b219f0db9d242da009d31a58 /telephony/java/android
parent953c4e04fab58678020a5741ba869b44aee581f4 (diff)
parentae166fe9e074de30c24f5bd567f6404b50cd9cfa (diff)
downloadframeworks_base-994a9a39b56a6cf7538c1b4254cdd604bc1c2557.zip
frameworks_base-994a9a39b56a6cf7538c1b4254cdd604bc1c2557.tar.gz
frameworks_base-994a9a39b56a6cf7538c1b4254cdd604bc1c2557.tar.bz2
am e9c9547e: am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit 'e9c9547e899a7095f3fb420df7d4d809ab13ea57': Telephony: Add functionality to handle ICC IO error
Diffstat (limited to 'telephony/java/android')
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index af91fe3..c21319c 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1109,6 +1109,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
@@ -1135,6 +1139,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);
@@ -1153,6 +1158,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;
}