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

Merge "[RCS] Add carrier config "use_rcs_sip_options_bool" for check if SIP OPTIONS is supported"

Browse Source
This commit is contained in:
James Lin
2019-10-02 15:26:22 +00:00
committed by Gerrit Code Review
parent 4b4f463d3c 9f5e1f7509
commit 74ad1b81ab
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -44167,6 +44167,7 @@ package android.telephony {
field public static final String KEY_USE_HFA_FOR_PROVISIONING_BOOL = "use_hfa_for_provisioning_bool"; field public static final String KEY_USE_HFA_FOR_PROVISIONING_BOOL = "use_hfa_for_provisioning_bool";
field public static final String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_bool"; field public static final String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_bool";
field public static final String KEY_USE_RCS_PRESENCE_BOOL = "use_rcs_presence_bool"; field public static final String KEY_USE_RCS_PRESENCE_BOOL = "use_rcs_presence_bool";
field public static final String KEY_USE_RCS_SIP_OPTIONS_BOOL = "use_rcs_sip_options_bool";
field public static final String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool"; field public static final String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";
field public static final String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool"; field public static final String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";
field public static final String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int"; field public static final String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";

12
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1717,9 +1717,8 @@ public class CarrierConfigManager {
"allow_emergency_video_calls_bool"; "allow_emergency_video_calls_bool";
/** /**
* Flag indicating whether the carrier supports RCS presence indication for video calls. When * Flag indicating whether the carrier supports RCS presence indication for
* {@code true}, the carrier supports RCS presence indication for video calls. When presence * User Capability Exchange (UCE). When presence is supported, the device should use the
* is supported, the device should use the
* {@link android.provider.ContactsContract.Data#CARRIER_PRESENCE} bit mask and set the * {@link android.provider.ContactsContract.Data#CARRIER_PRESENCE} bit mask and set the
* {@link android.provider.ContactsContract.Data#CARRIER_PRESENCE_VT_CAPABLE} bit to indicate * {@link android.provider.ContactsContract.Data#CARRIER_PRESENCE_VT_CAPABLE} bit to indicate
* whether each contact supports video calling. The UI is made aware that presence is enabled * whether each contact supports video calling. The UI is made aware that presence is enabled
@@ -1729,6 +1728,12 @@ public class CarrierConfigManager {
*/ */
public static final String KEY_USE_RCS_PRESENCE_BOOL = "use_rcs_presence_bool"; public static final String KEY_USE_RCS_PRESENCE_BOOL = "use_rcs_presence_bool";
/**
* Flag indicating whether the carrier supports RCS SIP OPTIONS indication for
* User Capability Exchange (UCE).
*/
public static final String KEY_USE_RCS_SIP_OPTIONS_BOOL = "use_rcs_sip_options_bool";
/** /**
* The duration in seconds that platform call and message blocking is disabled after the user * The duration in seconds that platform call and message blocking is disabled after the user
* contacts emergency services. Platform considers values for below cases: * contacts emergency services. Platform considers values for below cases:
@@ -3341,6 +3346,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true); sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true);
sDefaults.putInt(KEY_EMERGENCY_SMS_MODE_TIMER_MS_INT, 0); sDefaults.putInt(KEY_EMERGENCY_SMS_MODE_TIMER_MS_INT, 0);
sDefaults.putBoolean(KEY_USE_RCS_PRESENCE_BOOL, false); sDefaults.putBoolean(KEY_USE_RCS_PRESENCE_BOOL, false);
sDefaults.putBoolean(KEY_USE_RCS_SIP_OPTIONS_BOOL, false);
sDefaults.putBoolean(KEY_FORCE_IMEI_BOOL, false); sDefaults.putBoolean(KEY_FORCE_IMEI_BOOL, false);
sDefaults.putInt( sDefaults.putInt(
KEY_CDMA_ROAMING_MODE_INT, TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT); KEY_CDMA_ROAMING_MODE_INT, TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT);