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

Commit 50cf3721 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "UE shows ef_pnn as WFC carreir name if spn is null." am: 4a2aef29 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1347351

Change-Id: I5d2c4ab6006b50f34500a1159882f4ea719aac01
parents eba967bb 4a2aef29

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

+7 −0
Original line number Diff line number Diff line
@@ -2782,6 +2782,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))) {