diff options
| author | Wink Saville <wink@google.com> | 2014-06-18 18:06:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-17 21:03:08 +0000 |
| commit | b576cec2626d469868f0908b7926790ea5b91493 (patch) | |
| tree | a965e16e696613a4e0c30434a6fce4c7d7641857 /telephony/java | |
| parent | 5adf8ee451085ed6106b7dbadc6d8dcd9d90722b (diff) | |
| parent | eeacf9374748a5f7fc96a1beaf18c353d473d752 (diff) | |
| download | frameworks_base-b576cec2626d469868f0908b7926790ea5b91493.zip frameworks_base-b576cec2626d469868f0908b7926790ea5b91493.tar.gz frameworks_base-b576cec2626d469868f0908b7926790ea5b91493.tar.bz2 | |
Merge "Empty triangle displayed for radio signal but calls & data work"
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/android/telephony/SubInfoRecord.java | 7 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/SubInfoRecord.java b/telephony/java/android/telephony/SubInfoRecord.java index 670def7..ced8e2f 100644 --- a/telephony/java/android/telephony/SubInfoRecord.java +++ b/telephony/java/android/telephony/SubInfoRecord.java @@ -105,4 +105,11 @@ public class SubInfoRecord implements Parcelable { return 0; } + public String toString() { + return "{mSubId=" + mSubId + ", mIccId=" + mIccId + " mSlotId=" + mSlotId + + " mDisplayName=" + mDisplayName + " mNameSource=" + mNameSource + + " mColor=" + mColor + " mNumber=" + mNumber + + " mDispalyNumberFormat=" + mDispalyNumberFormat + " mDataRoaming=" + mDataRoaming + + " mSimIconRes=" + mSimIconRes + "}"; + } } diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 859a890..79e9fd5 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -697,12 +697,16 @@ public class SubscriptionManager implements BaseColumns { public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId) { long [] subId = SubscriptionManager.getSubId(phoneId); if ((subId != null) && (subId.length >= 1)) { - if (VDBG) logd("putPhoneIdAndSubIdExtra: phoneId=" + phoneId + " subId=" + subId); - intent.putExtra(PhoneConstants.SLOT_KEY, phoneId); //FIXME: RENAME TO PHONE_ID_KEY ?? - intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId[0]); + putPhoneIdAndSubIdExtra(intent, phoneId, subId[0]); } else { logd("putPhoneIdAndSubIdExtra: no valid subs"); } } + + public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId, long subId) { + if (VDBG) logd("putPhoneIdAndSubIdExtra: phoneId=" + phoneId + " subId=" + subId); + intent.putExtra(PhoneConstants.SLOT_KEY, phoneId); //FIXME: RENAME TO PHONE_ID_KEY ?? + intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId); + } } |