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

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

Snap for 9000567 from 4c5c285d to tm-qpr1-release 

Change-Id: I1a2a12f493cc36146e3c6fb5a6b603bb8013dd45
parents d5ab6c67 4c5c285d

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

+1 −0
Original line number Diff line number Diff line
@@ -2845,6 +2845,7 @@ public class ServiceStateTracker extends Handler { 
        String wfcFlightSpnFormat = null;

        int combinedRegState = getCombinedRegState(mSS);

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

                && mPhone.isImsRegistered()

                && (combinedRegState == ServiceState.STATE_IN_SERVICE

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

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

src/java/com/android/internal/telephony/cdnr/CarrierDisplayNameResolver.java

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ public class CarrierDisplayNameResolver { 
            }

        } else if (mPhone.getServiceStateTracker().getCombinedRegState(getServiceState())

                == ServiceState.STATE_IN_SERVICE) {

            if (mPhone.isWifiCallingEnabled()) {

            if (mPhone.isWifiCallingEnabled() && mPhone.isImsRegistered()) {

                data = getCarrierDisplayNameFromWifiCallingOverride(data);

                if (DBG) {

                    Rlog.d(TAG, "CarrierName override by wifi-calling " + data);

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -2758,6 +2758,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 


        // wifi-calling is enabled

        doReturn(true).when(mPhone).isWifiCallingEnabled();

        doReturn(true).when(mPhone).isImsRegistered();



        // update the spn

        sst.updateSpnDisplay();
@@ -2790,6 +2791,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 


        // wifi-calling is enabled

        doReturn(true).when(mPhone).isWifiCallingEnabled();

        doReturn(true).when(mPhone).isImsRegistered();



        // update the spn

        sst.updateSpnDisplay();