From d6552acf19b6139038b97fbf709b2099add03499 Mon Sep 17 00:00:00 2001
From: Daniel Bright <dbright@google.com>
Date: Mon, 6 Jan 2020 12:47:14 -0800
Subject: [PATCH] Change get sub id list to get sub info list

Bug: 147239065
Test: FrameworkBaseTests
Change-Id: Id9860eb48cffbe6c5517e51d1c6ed29a84997bbd
---
 .../common/com/google/android/mms/pdu/PduPersister.java      | 5 +++--
 1 file 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 b237705274da6..8efca0ea3909f 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);
                 }