Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change get sub id list to get sub info list" am: 0c648888ea am: ad58c226ea

Browse Source 
Change-Id: I2852fdffd8896f6eb0c890e0d7da987f047fa71d
This commit is contained in:
Automerger Merge Worker
2020-01-07 03:17:12 +00:00
parent af1eb246ef ad58c226ea
commit 77daa9a283
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/common/com/google/android/mms/pdu/PduPersister.java
View File

@@ -34,6 +34,7 @@ import android.provider.Telephony.MmsSms;
import android.provider.Telephony.MmsSms.PendingMessages; import android.provider.Telephony.MmsSms.PendingMessages;
import android.provider.Telephony.Threads; import android.provider.Telephony.Threads;
import android.telephony.PhoneNumberUtils; import android.telephony.PhoneNumberUtils;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
@@ -1448,9 +1449,9 @@ public class PduPersister {
final Set<String> myPhoneNumbers = new HashSet<String>(); final Set<String> myPhoneNumbers = new HashSet<String>();
if (excludeMyNumber) { if (excludeMyNumber) {
// Build a list of my phone numbers from the various sims. // 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). final String myNumber = mContext.getSystemService(TelephonyManager.class).
createForSubscriptionId(subid).getLine1Number(); createForSubscriptionId(subInfo.getSubscriptionId()).getLine1Number();
if (myNumber != null) { if (myNumber != null) {
myPhoneNumbers.add(myNumber); myPhoneNumbers.add(myNumber);
} }