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

Commit c2edf980 authored by Arun Voddu's avatar Arun Voddu Committed by Android (Google) Code Review
Browse files

Merge "Fixed null name not to display in carrier name in status bar on the device" into main

parents 806923c4 62d2215d

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

+4 −2
Original line number Diff line number Diff line
@@ -2803,8 +2803,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)