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

Commit b4bc03f9 authored by Sarah Chin's avatar Sarah Chin
Browse files

WFC SPN only when connected to WiFi 

Test: atest ServiceStateTrackerTest
Bug: 203527657
Change-Id: Ib77c83a7ba759cf1c1bcc0054f97e9a02b3c74fc
Merged-In: Ib77c83a7ba759cf1c1bcc0054f97e9a02b3c74fc
parent a16b1ab3

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -2754,8 +2754,10 @@ public class ServiceStateTracker extends Handler { 
        String wfcFlightSpnFormat = null;

        String wfcFlightSpnFormat = null;

        int combinedRegState = getCombinedRegState(mSS);

        int combinedRegState = getCombinedRegState(mSS);

        if (mPhone.getImsPhone() != null && mPhone.getImsPhone().isWifiCallingEnabled()

        if (mPhone.getImsPhone() != null && mPhone.getImsPhone().isWifiCallingEnabled()

                && (combinedRegState == ServiceState.STATE_IN_SERVICE)) {

                && (combinedRegState == ServiceState.STATE_IN_SERVICE

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

                && mSS.getDataNetworkType() == TelephonyManager.NETWORK_TYPE_IWLAN)) {

            // In Wi-Fi Calling mode (connected to WiFi and WFC enabled),

            // show SPN or PLMN + WiFi Calling

            //

            //

            // 1) Show SPN + Wi-Fi Calling If SIM has SPN and SPN display condition

            // 1) Show SPN + Wi-Fi Calling If SIM has SPN and SPN display condition

            //    is satisfied or SPN override is enabled for this carrier

            //    is satisfied or SPN override is enabled for this carrier