diff options
author | John Wang <johnwang@google.com> | 2011-06-10 17:31:42 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-10 17:31:42 -0700 |
commit | e1a4fcdeaa5f5755fe4ec8b156c4d095347bf1ed (patch) | |
tree | d527674d2769bac6e3dc786dbbbdf55f13e2df6b /telephony | |
parent | 8aec83eb15a94b8027bbe7b6358cdf2468fd2b5c (diff) | |
parent | cc44bea0400bc6b6e995d66b705a4db0a77a7dfa (diff) | |
download | frameworks_base-e1a4fcdeaa5f5755fe4ec8b156c4d095347bf1ed.zip frameworks_base-e1a4fcdeaa5f5755fe4ec8b156c4d095347bf1ed.tar.gz frameworks_base-e1a4fcdeaa5f5755fe4ec8b156c4d095347bf1ed.tar.bz2 |
am cc44bea0: am 2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTE
* commit 'cc44bea0400bc6b6e995d66b705a4db0a77a7dfa':
Add toString for IccCard Status and App.
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/com/android/internal/telephony/IccCardApplication.java | 11 | ||||
-rw-r--r-- | telephony/java/com/android/internal/telephony/IccCardStatus.java | 29 |
2 files changed, 40 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/IccCardApplication.java b/telephony/java/com/android/internal/telephony/IccCardApplication.java index 4cf21ee..434c484 100644 --- a/telephony/java/com/android/internal/telephony/IccCardApplication.java +++ b/telephony/java/com/android/internal/telephony/IccCardApplication.java @@ -177,4 +177,15 @@ public class IccCardApplication { return newSubState; } + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + + sb.append("{").append(app_type).append(",").append(app_state); + if (app_state == AppState.APPSTATE_SUBSCRIPTION_PERSO) { + sb.append(",").append(perso_substate); + } + sb.append("}"); + return sb.toString(); + } } diff --git a/telephony/java/com/android/internal/telephony/IccCardStatus.java b/telephony/java/com/android/internal/telephony/IccCardStatus.java index 7199616..e9de922 100644 --- a/telephony/java/com/android/internal/telephony/IccCardStatus.java +++ b/telephony/java/com/android/internal/telephony/IccCardStatus.java @@ -144,4 +144,33 @@ public class IccCardStatus { return mApplications.get(index); } + @Override + public String toString() { + IccCardApplication app; + + StringBuilder sb = new StringBuilder(); + sb.append("IccCardState {").append(mCardState).append(",") + .append(mUniversalPinState) + .append(",num_apps=").append(mNumApplications) + .append(",gsm_id=").append(mGsmUmtsSubscriptionAppIndex); + if (mGsmUmtsSubscriptionAppIndex >=0 + && mGsmUmtsSubscriptionAppIndex <CARD_MAX_APPS) { + app = getApplication(mGsmUmtsSubscriptionAppIndex); + sb.append(app == null ? "null" : app); + } + + sb.append(",cmda_id=").append(mCdmaSubscriptionAppIndex); + if (mCdmaSubscriptionAppIndex >=0 + && mCdmaSubscriptionAppIndex <CARD_MAX_APPS) { + app = getApplication(mCdmaSubscriptionAppIndex); + sb.append(app == null ? "null" : app); + } + + sb.append(",ism_id=").append(mImsSubscriptionAppIndex); + + sb.append("}"); + + return sb.toString(); + } + } |