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

Commit 6b02d204 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "SystemUI: Show one name if both plmn and spn are equal"

parents d684b41b f0e47838

packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkControllerImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -957,6 +957,8 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
        }

        StringBuilder str = new StringBuilder();

        boolean something = false;

        boolean withSamePlmnSpn = showPlmn && plmn != null

                && showSpn && spn != null && plmn.equals(spn);

        if (showPlmn && plmn != null) {

            if(mContext.getResources().getBoolean(com.android.internal.R.bool.config_display_rat) &&

                    mMSimServiceState[phoneId] != null) {
@@ -965,7 +967,7 @@ public class MSimNetworkControllerImpl extends NetworkControllerImpl { 
            str.append(plmn);

            something = true;

        }

        if (showSpn && spn != null) {

        if (!withSamePlmnSpn && showSpn && spn != null) {

            if(mContext.getResources().getBoolean(

                    com.android.internal.R.bool.config_spn_display_control)

                    && something){

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -1036,6 +1036,8 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        }

        StringBuilder str = new StringBuilder();

        boolean something = false;

        boolean withSamePlmnSpn = showPlmn && plmn != null

                && showSpn && spn != null && plmn.equals(spn);

        if (showPlmn && plmn != null) {

            if(mContext.getResources().getBoolean(com.android.internal.R.bool.config_display_rat) &&

                    mServiceState != null) {
@@ -1044,7 +1046,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            str.append(plmn);

            something = true;

        }

        if (showSpn && spn != null) {

        if (!withSamePlmnSpn && showSpn && spn != null) {

            if(mContext.getResources().getBoolean(

                    com.android.internal.R.bool.config_spn_display_control)

                    && something){