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

Commit efb39577 authored by Pengquan Meng's avatar Pengquan Meng Committed by Gerrit Code Review
Browse files

Merge "Show PLMN if SPN is null or empty"

parents 5b37dd66 a463ce3b

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

+4 −0
Original line number Diff line number Diff line
@@ -3797,6 +3797,10 @@ public class ServiceStateTracker extends Handler { 
            // If the operator has been overridden, all PLMNs will be considered HOME PLMNs, only

            // show SPN.

            return CARRIER_NAME_DISPLAY_BITMASK_SHOW_SPN;

        } else if (TextUtils.isEmpty(getServiceProviderName())) {

            // If SPN is null or empty, we should show plmn.

            // This is a hack from IccRecords#getServiceProviderName().

            return CARRIER_NAME_DISPLAY_BITMASK_SHOW_PLMN;

        } else {

            boolean useRoamingFromServiceState = config.getBoolean(

                    CarrierConfigManager.KEY_SPN_DISPLAY_RULE_USE_ROAMING_FROM_SERVICE_STATE_BOOL);