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

Commit 4b20ea01 authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

Merge "Show PLMN if SPN is null or empty" 

am: efb39577

Change-Id: I3d91a079fcb5d2a452206e6fe747253237523f90
parents d7d18fb7 efb39577

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

+4 −0
Original line number Original line 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

            // If the operator has been overridden, all PLMNs will be considered HOME PLMNs, only

            // show SPN.

            // show SPN.

            return CARRIER_NAME_DISPLAY_BITMASK_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 {

        } else {

            boolean useRoamingFromServiceState = config.getBoolean(

            boolean useRoamingFromServiceState = config.getBoolean(

                    CarrierConfigManager.KEY_SPN_DISPLAY_RULE_USE_ROAMING_FROM_SERVICE_STATE_BOOL);

                    CarrierConfigManager.KEY_SPN_DISPLAY_RULE_USE_ROAMING_FROM_SERVICE_STATE_BOOL);