summaryrefslogtreecommitdiffstats
path: root/telephony/java/com
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2014-04-26 00:25:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-26 00:25:44 +0000
commitc79963c3cb6d0127e2fc9ce5bf000fa05811504d (patch)
tree570aba58220dc865c03b62586c21107f9569c19b /telephony/java/com
parent165b965edb42460ef9b0add89a76a311c707a1e2 (diff)
parent1c1827a6402c3a1f38ba077289a9022f6e6d3f73 (diff)
downloadframeworks_base-c79963c3cb6d0127e2fc9ce5bf000fa05811504d.zip
frameworks_base-c79963c3cb6d0127e2fc9ce5bf000fa05811504d.tar.gz
frameworks_base-c79963c3cb6d0127e2fc9ce5bf000fa05811504d.tar.bz2
am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit '1c1827a6402c3a1f38ba077289a9022f6e6d3f73': Telephony: Add functionality to handle ICC IO error
Diffstat (limited to 'telephony/java/com')
-rw-r--r--telephony/java/com/android/internal/telephony/IccCardConstants.java7
1 files changed, 5 insertions, 2 deletions
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));
}
}
}