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

Commit 7afeaaa0 authored by Hyejin Kim's avatar Hyejin Kim Committed by android-build-merger
Browse files

When Wi-Fi calling is available, be able to display only "Wi-Fi" 

am: 77a4ce6c

* commit '77a4ce6c':
  When Wi-Fi calling is available, be able to display only "Wi-Fi"
parents a23d91f3 77a4ce6c

src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

+6 −4
Original line number Diff line number Diff line
@@ -634,15 +634,17 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
                && ((rule & SIMRecords.SPN_RULE_SHOW_SPN)

                        == SIMRecords.SPN_RULE_SHOW_SPN);



        if (!TextUtils.isEmpty(spn)

                && mPhone.getImsPhone() != null

        if (mPhone.getImsPhone() != null

                && ((ImsPhone) mPhone.getImsPhone()).isVowifiEnabled()) {

            // In Wi-Fi Calling mode show SPN+WiFi

            // In Wi-Fi Calling mode show SPN?+WiFi

            String formatVoice = mPhone.getContext().getText(

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

            String formatData = mPhone.getContext().getText(

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

            String originalSpn = spn.trim();

            String originalSpn = "";

            if (!TextUtils.isEmpty(spn)) {

                originalSpn = spn.trim();

            }

            spn = String.format(formatVoice, originalSpn);

            dataSpn = String.format(formatData, originalSpn);

            showSpn = true;