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

Commit e857f3e8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "UE shows ef_pnn as WFC carreir name if spn is null." into rvc-dev

parents c84c4692 032c84a4

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

+7 −0
Original line number Diff line number Diff line
@@ -2785,6 +2785,13 @@ public class ServiceStateTracker extends Handler { 
            } else if (!TextUtils.isEmpty(plmn) && !TextUtils.isEmpty(wfcVoiceSpnFormat)) {

                // Show PLMN + Wi-Fi Calling if there is no valid SPN in the above case

                String originalPlmn = plmn.trim();



                PersistableBundle config = getCarrierConfig();

                if (mIccRecords != null && config.getBoolean(

                        CarrierConfigManager.KEY_WFC_CARRIER_NAME_OVERRIDE_BY_PNN_BOOL)) {

                    originalPlmn = mIccRecords.getPnnHomeName();

                }



                plmn = String.format(wfcVoiceSpnFormat, originalPlmn);

            } else if (mSS.getState() == ServiceState.STATE_POWER_OFF

                    || (showPlmn && TextUtils.equals(spn, plmn))) {