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

Commit b44c5415 authored by Pengquan Meng's avatar Pengquan Meng
Browse files

Show PLMN if SPN is null or empty 

If SPN is empty we should show the PLMN unconditionlly, otherwise
nothing will be displayed in the status bar.

Bug: 131867800
Test: build
Change-Id: If58e2e3789c70f06f787b671592e75982e448448
parent 55afb1d4

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

+4 −0
Original line number Diff line number Diff line
@@ -3588,6 +3588,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);