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

Commit 3aebefa5 authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix build"" into mnc-dev

parents 1bb5ae03 b4571e26

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

+3 −2
Original line number Diff line number Diff line
@@ -627,7 +627,8 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
            // In Wi-Fi Calling mode show SPN+WiFi

            String formatVoice = mPhone.getContext().getText(

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

            String formatData = "Fix build";

            String formatData = mPhone.getContext().getText(

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

            String originalSpn = spn.trim();

            spn = String.format(formatVoice, originalSpn);

            dataSpn = String.format(formatData, originalSpn);
@@ -656,7 +657,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
            intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

            intent.putExtra(TelephonyIntents.EXTRA_SHOW_SPN, showSpn);

            intent.putExtra(TelephonyIntents.EXTRA_SPN, spn);

            //intent.putExtra(TelephonyIntents.EXTRA_DATA_SPN, dataSpn);

            intent.putExtra(TelephonyIntents.EXTRA_DATA_SPN, dataSpn);

            intent.putExtra(TelephonyIntents.EXTRA_SHOW_PLMN, showPlmn);

            intent.putExtra(TelephonyIntents.EXTRA_PLMN, plmn);

            SubscriptionManager.putPhoneIdAndSubIdExtra(intent, mPhone.getPhoneId());