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

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

Merge "IMS: When RTT is always enabled, then set the RTT_CALLING_MODE in DB... 

Merge "IMS: When RTT is always enabled, then set the RTT_CALLING_MODE in DB based on default RTT_MODE value."
parents f3ef21a4 13b90bba

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

+12 −2
Original line number Diff line number Diff line
@@ -2216,10 +2216,20 @@ public class ImsManager implements FeatureUpdates { 
                getBooleanCarrierConfig(CarrierConfigManager.KEY_RTT_SUPPORTED_BOOL)

                || !isActiveSubscriptionPresent;



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

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

        int defaultRttMode =

                getIntCarrierConfig(CarrierConfigManager.KEY_DEFAULT_RTT_MODE_INT);

        int rttMode = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.RTT_CALLING_MODE, defaultRttMode);

        logi("defaultRttMode = " + defaultRttMode + " rttMode = " + rttMode);

        boolean isRttAlwaysOnCarrierConfig = getBooleanCarrierConfig(

                CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL);

        if (isRttAlwaysOnCarrierConfig && rttMode == defaultRttMode) {

            Settings.Secure.putInt(mContext.getContentResolver(),

                    Settings.Secure.RTT_CALLING_MODE, defaultRttMode);

        }



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

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



        boolean shouldImsRttBeOn = isRttUiSettingEnabled || isRttAlwaysOnCarrierConfig;

        logi("update RTT: settings value: " + isRttUiSettingEnabled + " always-on carrierconfig: "