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

Commit 2c1d3407 authored by Junda Liu's avatar Junda Liu Committed by Android (Google) Code Review
Browse files

Merge "Update telemgr calls with subId to new APIs with ForSubscriber suffix." into lmp-dev

parents b5a68902 96d96141

src/java/com/android/internal/telephony/SubInfoRecordUpdater.java

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ public class SubInfoRecordUpdater extends Handler { 
                            SubscriptionManager.INVALID_SUB_ID);



                    if (SubscriptionManager.isValidSubId(subId)) {

                        String msisdn = TelephonyManager.getDefault().getLine1Number(subId);

                        String msisdn = TelephonyManager.getDefault().getLine1NumberForSubscriber(subId);

                        ContentResolver contentResolver = sContext.getContentResolver();



                        if (msisdn != null) {
@@ -396,7 +396,7 @@ public class SubInfoRecordUpdater extends Handler { 
        for (int i=0; i<nSubCount; i++) {

            SubInfoRecord temp = subInfos.get(i);



            String msisdn = TelephonyManager.getDefault().getLine1Number(temp.subId);

            String msisdn = TelephonyManager.getDefault().getLine1NumberForSubscriber(temp.subId);



            if (msisdn != null) {

                ContentValues value = new ContentValues(1);

src/java/com/android/internal/telephony/SubscriptionController.java

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ public class SubscriptionController extends ISub.Stub { 
        logd("[setDisplayNumber]- number:" + number + " set");



        Phone phone = sProxyPhones[phoneId];

        String alphaTag = TelephonyManager.getDefault().getLine1AlphaTag(subId);

        String alphaTag = TelephonyManager.getDefault().getLine1AlphaTagForSubscriber(subId);



        synchronized(mLock) {

            mSuccess = false;