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

Commit 34cccdc8 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28530683'] into 24Q3-release. 

Change-Id: I0c801df094fb39089e57f1ccf4723b79b3675a8a
parents 0524f0a3 d4484ab2

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

+4 −2
Original line number Diff line number Diff line
@@ -2801,8 +2801,10 @@ public class ServiceStateTracker extends Handler { 
        if (showPlmn) {

            carrierName = plmn;

            if (showSpn) {

                if (TextUtils.isEmpty(carrierName)) {

                    carrierName = spn;

                } else if (!TextUtils.isEmpty(spn) && !Objects.equals(spn, carrierName)) {

                    // Need to show both plmn and spn if both are not same.

                if (!Objects.equals(spn, plmn)) {

                    String separator = mPhone.getContext().getString(

                            com.android.internal.R.string.kg_text_message_separator).toString();

                    carrierName = new StringBuilder().append(carrierName).append(separator)