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

Commit 93d8998a authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Consider subId when reading resource wfcSpnFormat" am: f6d96344 am: 5e60d9e4 

am: 33bd6e84

Change-Id: I13e630bb66e4c1d76b71fd2193dc049cb8e356d0
parents 17b1629f 33bd6e84

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)