diff options
| author | Wink Saville <wink@google.com> | 2012-09-11 13:21:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-11 13:21:38 -0700 |
| commit | ea4f446a816ee1558c2776206642d0751fc2afb7 (patch) | |
| tree | ee189d4a0d448382c9fa94a66874014e8bdf57b1 /telephony | |
| parent | aec914b1301b9608053b77318c8ea86fa162f14d (diff) | |
| parent | 72c06bcf1970f615f5037b9f63759d06a527cb4e (diff) | |
| download | frameworks_base-ea4f446a816ee1558c2776206642d0751fc2afb7.zip frameworks_base-ea4f446a816ee1558c2776206642d0751fc2afb7.tar.gz frameworks_base-ea4f446a816ee1558c2776206642d0751fc2afb7.tar.bz2 | |
am 72c06bcf: am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"
* commit '72c06bcf1970f615f5037b9f63759d06a527cb4e':
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, |