diff options
author | Daniel Bright <dbright@google.com> | 2020-01-06 19:05:12 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2020-01-06 19:05:12 -0800 |
commit | ad58c226eaf4a588193c4d29621af9319ad419ac (patch) | |
tree | 1ec006edf0949a2a771af9d43633b1309331c025 | |
parent | e93312767b25b07773df7e09e9d58f4b51d936ea (diff) | |
parent | 0c648888ea9f2f97ee94b4c0a1cb81af186ec0f9 (diff) | |
download | base-ad58c226eaf4a588193c4d29621af9319ad419ac.tar.gz |
Merge "Change get sub id list to get sub info list"
am: 0c648888ea
Change-Id: I5763ad79bfd1c509da5ada49c099483c7906d1e0
-rwxr-xr-x | telephony/common/com/google/android/mms/pdu/PduPersister.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/telephony/common/com/google/android/mms/pdu/PduPersister.java b/telephony/common/com/google/android/mms/pdu/PduPersister.java index b237705274da..8efca0ea3909 100755 --- a/telephony/common/com/google/android/mms/pdu/PduPersister.java +++ b/telephony/common/com/google/android/mms/pdu/PduPersister.java @@ -34,6 +34,7 @@ import android.provider.Telephony.MmsSms; import android.provider.Telephony.MmsSms.PendingMessages; import android.provider.Telephony.Threads; import android.telephony.PhoneNumberUtils; +import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.text.TextUtils; @@ -1448,9 +1449,9 @@ public class PduPersister { final Set<String> myPhoneNumbers = new HashSet<String>(); if (excludeMyNumber) { // Build a list of my phone numbers from the various sims. - for (int subid : subscriptionManager.getActiveSubscriptionIdList()) { + for (SubscriptionInfo subInfo : subscriptionManager.getActiveSubscriptionInfoList()) { final String myNumber = mContext.getSystemService(TelephonyManager.class). - createForSubscriptionId(subid).getLine1Number(); + createForSubscriptionId(subInfo.getSubscriptionId()).getLine1Number(); if (myNumber != null) { myPhoneNumbers.add(myNumber); } |