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

Commit 51c733fe authored by Grace Jia's avatar Grace Jia Committed by Automerger Merge Worker
Browse files

Check if advanced calling setting enabled when update VT feature. am:... 

Check if advanced calling setting enabled when update VT feature. am: 1df87665 am: 25daaa9c am: b6c9b8a2 am: da389fef

Change-Id: Ie58e97dca47631a992419f1c02bf0d92d8e730d6
parents bd8c4dff da389fef

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

+8 −4
Original line number Diff line number Diff line
@@ -1402,17 +1402,21 @@ public class ImsManager implements IFeatureConnector { 
     */

    private void updateVideoCallFeatureValue(CapabilityChangeRequest request) {

        boolean available = isVtEnabledByPlatform();

        boolean enabled = isVtEnabledByUser();

        boolean vtEnabled = isVtEnabledByUser();

        boolean advancedEnabled = isEnhanced4gLteModeSettingEnabledByUser();

        boolean isNonTty = isNonTtyOrTtyOnVolteEnabled();

        boolean isDataEnabled = isDataEnabled();

        boolean ignoreDataEnabledChanged = getBooleanCarrierConfig(

                CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS);

        boolean isProvisioned = isVtProvisionedOnDevice();

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

                && (ignoreDataEnabledChanged || isDataEnabled);

        // TODO: Support carrier config setting about if VT settings should be associated with

        //  advanced calling settings.

        boolean isFeatureOn = available && vtEnabled && isNonTty && isProvisioned

                && advancedEnabled && (ignoreDataEnabledChanged || isDataEnabled);



        log("updateVideoCallFeatureValue: available = " + available

                + ", enabled = " + enabled

                + ", vtenabled = " + vtEnabled

                + ", advancedCallEnabled = " + advancedEnabled

                + ", nonTTY = " + isNonTty

                + ", data enabled = " + isDataEnabled

                + ", provisioned = " + isProvisioned