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

Commit f1945ddf authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Added configuration for VT downgrade/tear down when data disabled 

am: 5778185c

Change-Id: Id27502754e2a0fdc72e955594809e6207fc4973b
parents 6c7a14d2 5778185c

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

+9 −2
Original line number Diff line number Diff line
@@ -795,8 +795,11 @@ public class ImsManager { 
        boolean enabled = isVtEnabledByUser(mContext);

        boolean isNonTty = isNonTtyOrTtyOnVolteEnabled(mContext);

        boolean isDataEnabled = isDataEnabled();

        boolean ignoreDataEnabledChanged = getBooleanCarrierConfig(mContext,

                CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS);



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

        boolean isFeatureOn = available && enabled && isNonTty

                && (ignoreDataEnabledChanged || isDataEnabled);



        log("updateVideoCallFeatureValue: available = " + available

                + ", enabled = " + enabled
@@ -1406,8 +1409,10 @@ public class ImsManager { 
                        TelephonyManager.NETWORK_TYPE_LTE, turnOn ? 1 : 0, mImsConfigListener);



                if (isVtEnabledByPlatform(mContext)) {

                    boolean ignoreDataEnabledChanged = getBooleanCarrierConfig(mContext,

                            CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS);

                    boolean enableViLte = turnOn && isVtEnabledByUser(mContext) &&

                            isDataEnabled();

                            (ignoreDataEnabledChanged || isDataEnabled());

                    config.setFeatureValue(ImsConfig.FeatureConstants.FEATURE_TYPE_VIDEO_OVER_LTE,

                            TelephonyManager.NETWORK_TYPE_LTE,

                            enableViLte ? 1 : 0,
@@ -1749,6 +1754,8 @@ public class ImsManager { 
        pw.println("  mConfigUpdated = " + mConfigUpdated);

        pw.println("  mImsService = " + mImsService);

        pw.println("  mDataEnabled = " + isDataEnabled());

        pw.println("  ignoreDataEnabledChanged = " + getBooleanCarrierConfig(mContext,

                CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS));



        pw.println("  isGbaValid = " + isGbaValid(mContext));

        pw.println("  isImsTurnOffAllowed = " + isImsTurnOffAllowed());