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

Commit 64ff5ded authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Check carrierconfig for whether to ignore RTT mode"

parents 1783a0e5 21d472ef

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

+12 −5
Original line number Diff line number Diff line
@@ -2174,13 +2174,20 @@ public class ImsManager { 
    public boolean updateRttConfigValue() {

        boolean isCarrierSupported =

                getBooleanCarrierConfig(CarrierConfigManager.KEY_RTT_SUPPORTED_BOOL);

        boolean isRttEnabled = Settings.Secure.getInt(mContext.getContentResolver(),

        boolean isRttUiSettingEnabled = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.RTT_CALLING_MODE, 0) != 0;

        Log.i(ImsManager.class.getSimpleName(), "update RTT value " + isRttEnabled);

        if (isCarrierSupported == true) {

            setRttConfig(isRttEnabled);

        boolean isRttAlwaysOnCarrierConfig = getBooleanCarrierConfig(

                CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL);



        boolean shouldImsRttBeOn = isRttUiSettingEnabled || isRttAlwaysOnCarrierConfig;

        Log.i(ImsManager.class.getSimpleName(), "update RTT: settings value: "

                + isRttUiSettingEnabled + " always-on carrierconfig: "

                + isRttAlwaysOnCarrierConfig);



        if (isCarrierSupported) {

            setRttConfig(shouldImsRttBeOn);

        }

        return isCarrierSupported && isRttEnabled;

        return isCarrierSupported && shouldImsRttBeOn;

    }



    private void setRttConfig(boolean enabled) {