Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad58c226 authored by Daniel Bright's avatar Daniel Bright Committed by android-build-merger
Browse files

Merge "Change get sub id list to get sub info list" 

am: 0c648888

Change-Id: I5763ad79bfd1c509da5ada49c099483c7906d1e0
parents e9331276 0c648888

telephony/common/com/google/android/mms/pdu/PduPersister.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -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);

                }

                }