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

Commit 9cba36d1 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Call setFeatureValue() even if turning off IMS. 

setFeatureValue() needs to be called so that next time IMS is turned
on, IMS stack knows which features to keep turned off. It should be
called after turnOffIms().

Bug: 30651940
Change-Id: Ia2d388d9336bfa6f7950f45c4a705bf5858cfa19
parent afb53c82

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

+20 −9
Original line number Diff line number Diff line
@@ -1351,12 +1351,11 @@ public class ImsManager { 
                || !isWfcEnabledByUser(mContext));

    }



    private void setAdvanced4GMode(boolean turnOn) throws ImsException {

        checkAndThrowExceptionIfServiceUnavailable();



    private void setLteFeatureValues(boolean turnOn) {

        log("setLteFeatureValues: " + turnOn);

        try {

            ImsConfig config = getConfigInterface();

            if (config != null && (turnOn || !isImsTurnOffAllowed())) {

            if (config != null) {

                config.setFeatureValue(ImsConfig.FeatureConstants.FEATURE_TYPE_VOICE_OVER_LTE,

                        TelephonyManager.NETWORK_TYPE_LTE, turnOn ? 1 : 0, mImsConfigListener);
@@ -1370,15 +1369,27 @@ public class ImsManager { 
                }

            }

        } catch (ImsException e) {

            loge("setAdvanced4GMode() : ", e);

            loge("setLteFeatureValues: exception ", e);

        }

    }



    private void setAdvanced4GMode(boolean turnOn) throws ImsException {

        checkAndThrowExceptionIfServiceUnavailable();



        // if turnOn: first set feature values then call turnOnIms()

        // if turnOff: only set feature values if IMS turn off is not allowed. If turn off is

        // allowed, first call turnOffIms() then set feature values

        if (turnOn) {

            log("setAdvanced4GMode() : turnOnIms");

            setLteFeatureValues(turnOn);

            log("setAdvanced4GMode: turnOnIms");

            turnOnIms();

        } else if (isImsTurnOffAllowed()) {

            log("setAdvanced4GMode() : imsServiceAllowTurnOff -> turnOffIms");

        } else {

            if (isImsTurnOffAllowed()) {

                log("setAdvanced4GMode: turnOffIms");

                turnOffIms();

            }

            setLteFeatureValues(turnOn);

        }

    }



    /**