Merge "IMS: Add new carrier config." am: 942b71b485

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409708

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c25528234d5a822f60dc853ce3131a6b946e9db
This commit is contained in:
Hall Liu
2021-01-19 22:58:45 +00:00
committed by Automerger Merge Worker

View File

@@ -4076,6 +4076,18 @@ public class CarrierConfigManager {
public static final String KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED =
"use_lower_mtu_value_if_both_received";
/**
* Determines the default RTT mode.
*
* Upon first boot, when the user has not yet set a value for their preferred RTT mode,
* the value of this config will be sent to the IMS stack. Valid values are the same as for
* {@link Settings.Secure#RTT_CALLING_MODE}.
*
* @hide
*/
public static final String KEY_DEFAULT_RTT_MODE_INT =
"default_rtt_mode_int";
/**
* Indicates if auto-configuration server is used for the RCS config
* Reference: GSMA RCC.14
@@ -4628,6 +4640,7 @@ public class CarrierConfigManager {
sDefaults.putString(KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING, "");
sDefaults.putBoolean(KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED, false);
sDefaults.putBoolean(KEY_USE_ACS_FOR_RCS_BOOL, false);
sDefaults.putInt(KEY_DEFAULT_RTT_MODE_INT, 0);
}
/**