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

Commit f6d96344 authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Consider subId when reading resource wfcSpnFormat"

parents 655e192c d7a9dfb9

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

+2 −2
Original line number Diff line number Diff line
@@ -2227,8 +2227,8 @@ public class ServiceStateTracker extends Handler { 
            //

            // 2) Show PLMN + Wi-Fi Calling if there is no valid SPN in case 1



            String[] wfcSpnFormats = mPhone.getContext().getResources().getStringArray(

                    com.android.internal.R.array.wfcSpnFormats);

            String[] wfcSpnFormats = SubscriptionManager.getResourcesForSubId(mPhone.getContext(),

                    mPhone.getSubId()).getStringArray(com.android.internal.R.array.wfcSpnFormats);

            int voiceIdx = 0;

            int dataIdx = 0;

            CarrierConfigManager configLoader = (CarrierConfigManager)