summaryrefslogtreecommitdiff
path: root/telephony/common
diff options
context:
space:
mode:
authorDaniel Bright <dbright@google.com>2020-01-06 12:47:14 -0800
committerDaniel Bright <dbright@google.com>2020-01-06 16:44:08 -0800
commit4542838c08039879c310e22902d39aab8ae4c44e (patch)
treea19ce0a54740e89416413e5cac2f198e1cf87d86 /telephony/common
parent3f51e53b12aac32ff67810eaa77293248ca99643 (diff)
Change get sub id list to get sub info list
Bug: 147239065 Test: FrameworkBaseTests Merged-In: Id9860eb48cffbe6c5517e51d1c6ed29a84997bbd Change-Id: Id9860eb48cffbe6c5517e51d1c6ed29a84997bbd
Diffstat (limited to 'telephony/common')
-rwxr-xr-xtelephony/common/com/google/android/mms/pdu/PduPersister.java5
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);
}