Merge "Deprecate KEY_IGNORE_RTT_MODE_SETTING_BOOL" am: c6ec27d2d4

am: a7d6573987

Change-Id: If0c13c830bd68343a2ad02149e2d2b13c009f1d4
This commit is contained in:
Hall Liu
2019-12-04 17:29:43 -08:00
committed by android-build-merger

View File

@@ -1049,6 +1049,9 @@ public class CarrierConfigManager {
*
* When {@code false}, the old behavior is used, where the toggle in accessibility settings is
* used to set the IMS stack's RTT enabled state.
*
* @deprecated -- this flag no longer does anything. Remove once the new behavior is verified.
*
* @hide
*/
public static final String KEY_IGNORE_RTT_MODE_SETTING_BOOL =
@@ -3526,7 +3529,7 @@ public class CarrierConfigManager {
sDefaults.putInt(KEY_IMS_DTMF_TONE_DELAY_INT, 0);
sDefaults.putInt(KEY_CDMA_DTMF_TONE_DELAY_INT, 100);
sDefaults.putBoolean(KEY_CALL_FORWARDING_MAP_NON_NUMBER_TO_VOICEMAIL_BOOL, false);
sDefaults.putBoolean(KEY_IGNORE_RTT_MODE_SETTING_BOOL, false);
sDefaults.putBoolean(KEY_IGNORE_RTT_MODE_SETTING_BOOL, true);
sDefaults.putInt(KEY_CDMA_3WAYCALL_FLASH_DELAY_INT , 0);
sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);
sDefaults.putBoolean(KEY_SUPPORT_IMS_CONFERENCE_CALL_BOOL, true);