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

Commit fd40df71 authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Consider ims provisioning status during IMS Configuration status update"

parents 2fc8022d 240e84ae

src/java/com/android/ims/ImsManager.java

+15 −7
Original line number Diff line number Diff line
@@ -1356,11 +1356,14 @@ public class ImsManager implements IFeatureConnector { 
        boolean available = isVolteEnabledByPlatform();

        boolean enabled = isEnhanced4gLteModeSettingEnabledByUser();

        boolean isNonTty = isNonTtyOrTtyOnVolteEnabled();

        boolean isFeatureOn = available && enabled && isNonTty;

        boolean isProvisioned = isVolteProvisionedOnDevice();

        boolean isFeatureOn = available && enabled && isNonTty && isProvisioned;



        log("updateVolteFeatureValue: available = " + available

                + ", enabled = " + enabled

                + ", nonTTY = " + isNonTty);

                + ", nonTTY = " + isNonTty

                + ", provisioned = " + isProvisioned

                + ", isFeatureOn = " + isFeatureOn);



        if (isFeatureOn) {

            request.addCapabilitiesToEnableForTech(
@@ -1383,14 +1386,16 @@ public class ImsManager implements IFeatureConnector { 
        boolean isDataEnabled = isDataEnabled();

        boolean ignoreDataEnabledChanged = getBooleanCarrierConfig(

                CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS);



        boolean isFeatureOn = available && enabled && isNonTty

        boolean isProvisioned = isVtProvisionedOnDevice();

        boolean isFeatureOn = available && enabled && isNonTty && isProvisioned

                && (ignoreDataEnabledChanged || isDataEnabled);



        log("updateVideoCallFeatureValue: available = " + available

                + ", enabled = " + enabled

                + ", nonTTY = " + isNonTty

                + ", data enabled = " + isDataEnabled);

                + ", data enabled = " + isDataEnabled

                + ", provisioned = " + isProvisioned

                + ", isFeatureOn = " + isFeatureOn);



        if (isFeatureOn) {

            request.addCapabilitiesToEnableForTech(
@@ -1411,14 +1416,17 @@ public class ImsManager implements IFeatureConnector { 
        boolean isNetworkRoaming = tm.isNetworkRoaming();

        boolean available = isWfcEnabledByPlatform();

        boolean enabled = isWfcEnabledByUser();

        boolean isProvisioned = isWfcProvisionedOnDevice();

        int mode = getWfcMode(isNetworkRoaming);

        boolean roaming = isWfcRoamingEnabledByUser();

        boolean isFeatureOn = available && enabled;

        boolean isFeatureOn = available && enabled && isProvisioned;



        log("updateWfcFeatureAndProvisionedValues: available = " + available

                + ", enabled = " + enabled

                + ", mode = " + mode

                + ", roaming = " + roaming);

                + ", provisioned = " + isProvisioned

                + ", roaming = " + roaming

                + ", isFeatureOn = " + isFeatureOn);



        if (isFeatureOn) {

            request.addCapabilitiesToEnableForTech(