Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 869fe2b548 to rvc-qpr-dev-plus-aosp

Browse Source 
Change-Id: Ie60e988df7d0dc1a48bb85e8f5cdfccd549ff319
This commit is contained in:
Hall Liu
2021-01-20 01:10:31 +00:00
parent 73326c9ebe 869fe2b548
commit 6ef67bbd6c
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
telephony/java/android/telephony/CarrierConfigManager.java
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
@@ -4636,6 +4648,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED, false);
sDefaults.putBoolean(KEY_USE_ACS_FOR_RCS_BOOL, false);
sDefaults.putBoolean(KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL, false);
sDefaults.putInt(KEY_DEFAULT_RTT_MODE_INT, 0);
}
/**