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

Commit 79ced5ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Verify ims registered before showing WFC at title bar" am: c6651780 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2199000



Change-Id: Ic41929b887d433dccf472466491a5c2a5a497f47
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df667a1b c6651780

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

+1 −0
Original line number Diff line number Diff line
@@ -2840,6 +2840,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
@@ -2745,6 +2745,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();
@@ -2777,6 +2778,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();