diff options
author | Wink Saville <wink@google.com> | 2012-09-11 13:17:17 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-11 13:17:17 -0700 |
commit | 0c99f7e36da7ebc92d0a084f3dc1717a7c31423e (patch) | |
tree | 97114fe0e66005223e13a0d39703fdeccbaccea9 /telephony | |
parent | 3150feef0b27ad34370904eb12875805f6c84e8a (diff) | |
parent | ba3cf72a08368ab40556b07b4518536bb59eb2f6 (diff) | |
download | frameworks_base-0c99f7e36da7ebc92d0a084f3dc1717a7c31423e.zip frameworks_base-0c99f7e36da7ebc92d0a084f3dc1717a7c31423e.tar.gz frameworks_base-0c99f7e36da7ebc92d0a084f3dc1717a7c31423e.tar.bz2 |
am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"
* commit 'ba3cf72a08368ab40556b07b4518536bb59eb2f6':
Telephony: Clarify IccCardConstants.State enum
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/com/android/internal/telephony/IccCardConstants.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/telephony/java/com/android/internal/telephony/IccCardConstants.java b/telephony/java/com/android/internal/telephony/IccCardConstants.java index 4d1eb3f..236bb2f 100644 --- a/telephony/java/com/android/internal/telephony/IccCardConstants.java +++ b/telephony/java/com/android/internal/telephony/IccCardConstants.java @@ -47,10 +47,13 @@ public class IccCardConstants { /* PERM_DISABLED means ICC is permanently disabled due to puk fails */ public static final String INTENT_VALUE_ABSENT_ON_PERM_DISABLED = "PERM_DISABLED"; - /* - UNKNOWN is a transient state, for example, after uesr inputs ICC pin under - PIN_REQUIRED state, the query for ICC status returns UNKNOWN before it - turns to READY + /** + * This is combination of IccCardStatus.CardState and IccCardApplicationStatus.AppState + * for external apps (like PhoneApp) to use + * + * UNKNOWN is a transient state, for example, after user inputs ICC pin under + * PIN_REQUIRED state, the query for ICC status returns UNKNOWN before it + * turns to READY */ public enum State { UNKNOWN, |