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

Commit 59805cab authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Do not use SubscriptionManager.getSubId" am: 12456b58 am: 9b216d8c 

am: cb5597c9

Change-Id: I818f77d6d1097f8e561e50acde7a28e636929e8c
parents b1f70b23 cb5597c9

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

+2 −10
Original line number Original line Diff line number Diff line
@@ -2244,11 +2244,7 @@ public class ServiceStateTracker extends Handler { 
                showSpn = false;

                showSpn = false;

            }

            }





            int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

            int subId = mPhone.getSubId();

            int[] subIds = SubscriptionManager.getSubId(mPhone.getPhoneId());

            if (subIds != null && subIds.length > 0) {

                subId = subIds[0];

            }





            // Update SPN_STRINGS_UPDATED_ACTION IFF any value changes

            // Update SPN_STRINGS_UPDATED_ACTION IFF any value changes

            if (mSubId != subId ||

            if (mSubId != subId ||
@@ -2290,11 +2286,7 @@ public class ServiceStateTracker extends Handler { 




            showPlmn = plmn != null;

            showPlmn = plmn != null;





            int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

            int subId = mPhone.getSubId();

            int[] subIds = SubscriptionManager.getSubId(mPhone.getPhoneId());

            if (subIds != null && subIds.length > 0) {

                subId = subIds[0];

            }





            if (!TextUtils.isEmpty(plmn) && !TextUtils.isEmpty(wfcVoiceSpnFormat)) {

            if (!TextUtils.isEmpty(plmn) && !TextUtils.isEmpty(wfcVoiceSpnFormat)) {

                // In Wi-Fi Calling mode show SPN+WiFi

                // In Wi-Fi Calling mode show SPN+WiFi