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

Commit 25daaa9c 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: 1df87665 

Change-Id: I4cc599a55cbea0fa3fa436b2f40d3270140a19e0
parents 133ca94e 1df87665

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