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

Commit 032c84a4 authored by SongFerngWang's avatar SongFerngWang
Browse files

UE shows ef_pnn as WFC carreir name if spn is null. 

If spn is null, UE shows ef_pnn as WFC carrier name. It controls by
carrier config KEY_WFC_CARRIER_NAME_OVERRIDE_BY_PNN_BOOL.

Bug: 157108864
Test: UE with TMO sim card to test in Roaming and WFC on, and then
check operator name. (PASS)

Change-Id: I05151118e5e418962b8877a13054b0c29f92568c
parent f5b6d4bd

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))) {