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

Merge "[RCS]Add new carrier configs for presence" am: f2fdcff51e am: 992b4ffdf8 am: 2fc4cc29bc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I704895d43045983426ea3fff2363bfed8e9281b8
This commit is contained in:
Allen Su
2020-12-22 07:16:06 +00:00
committed by Automerger Merge Worker
parent 92cbd59571 2fc4cc29bc
commit 103627d3bc
4 changed files with 70 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/api/current.txt
View File

@@ -33635,8 +33635,8 @@ package android.provider {
}
protected static interface ContactsContract.DataColumns {
field public static final String CARRIER_PRESENCE = "carrier_presence";
field public static final int CARRIER_PRESENCE_VT_CAPABLE = 1; // 0x1
field @Deprecated public static final String CARRIER_PRESENCE = "carrier_presence";
field @Deprecated public static final int CARRIER_PRESENCE_VT_CAPABLE = 1; // 0x1
field public static final String DATA1 = "data1";
field public static final String DATA10 = "data10";
field public static final String DATA11 = "data11";
@@ -40689,7 +40689,7 @@ package android.telephony {
field public static final String KEY_USE_ACS_FOR_RCS_BOOL = "use_acs_for_rcs_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_RCS_PRESENCE_BOOL = "use_rcs_presence_bool";
field @Deprecated 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_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL = "use_wfc_home_network_mode_in_roaming_network_bool";
field public static final String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";
@@ -40729,9 +40729,12 @@ package android.telephony {
}
public static final class CarrierConfigManager.Ims {
field public static final String KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL = "ims.enable_presence_capability_exchange_bool";
field public static final String KEY_ENABLE_PRESENCE_GROUP_SUBSCRIBE_BOOL = "ims.enable_presence_group_subscribe_bool";
field public static final String KEY_ENABLE_PRESENCE_PUBLISH_BOOL = "ims.enable_presence_publish_bool";
field public static final String KEY_IMS_SINGLE_REGISTRATION_REQUIRED_BOOL = "ims.ims_single_registration_required_bool";
field public static final String KEY_PREFIX = "ims.";
field public static final String KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL = "ims.rcs_bulk_capability_exchange_bool";
field public static final String KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT = "ims.wifi_off_deferring_time_millis_int";
}