drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose grouping and opportunistic carrier config keys.

Browse Source 
These have been fully functional since Q, but were not a part of the
public API at that time. This makes the keys public with a note that
they'll work all the way back to Q (API 29).

The security concern has been resolved in b/181053462.

Fix: 130676550
Test: m update-api && m offline-sdk-docs && m -j
Change-Id: Ie2e4370999d48543517346e933ac35f6d298a127
This commit is contained in:
Hunter Knepshield 2020-05-21 17:17:04 -07:00 committed by Rambo Wang
parent 134f59f851
commit 73161658fe
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/api/current.txt
View File

@ -39818,6 +39818,7 @@ package android.telephony {
field public static final String KEY_IMS_CONFERENCE_SIZE_LIMIT_INT = "ims_conference_size_limit_int";
field public static final String KEY_IMS_DTMF_TONE_DELAY_INT = "ims_dtmf_tone_delay_int";
field public static final String KEY_IS_IMS_CONFERENCE_SIZE_ENFORCED_BOOL = "is_ims_conference_size_enforced_bool";
field public static final String KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL = "is_opportunistic_subscription_bool";
field public static final String KEY_LTE_ENABLED_BOOL = "lte_enabled_bool";
field public static final String KEY_LTE_RSRQ_THRESHOLDS_INT_ARRAY = "lte_rsrq_thresholds_int_array";
field public static final String KEY_LTE_RSSNR_THRESHOLDS_INT_ARRAY = "lte_rssnr_thresholds_int_array";
@ -39902,6 +39903,7 @@ package android.telephony {
field public static final String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";
field public static final String KEY_SMDP_SERVER_ADDRESS_STRING = "smdp_server_address_string";
field public static final String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";
field public static final String KEY_SUBSCRIPTION_GROUP_UUID_STRING = "subscription_group_uuid_string";
field public static final String KEY_SUPPORTS_CALL_COMPOSER_BOOL = "supports_call_composer_bool";
field public static final String KEY_SUPPORTS_DEVICE_TO_DEVICE_COMMUNICATION_USING_DTMF_BOOL = "supports_device_to_device_communication_using_dtmf_bool";
field public static final String KEY_SUPPORTS_DEVICE_TO_DEVICE_COMMUNICATION_USING_RTP_BOOL = "supports_device_to_device_communication_using_rtp_bool";
@ -39945,6 +39947,7 @@ package android.telephony {
field public static final String KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING = "wfc_emergency_address_carrier_app_string";
field public static final String KEY_WORLD_MODE_ENABLED_BOOL = "world_mode_enabled_bool";
field public static final String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
field public static final String REMOVE_GROUP_UUID_STRING = "00000000-0000-0000-0000-000000000000";
field public static final int SERVICE_CLASS_NONE = 0; // 0x0
field public static final int SERVICE_CLASS_VOICE = 1; // 0x1
field public static final int USSD_OVER_CS_ONLY = 2; // 0x2

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

@ -4402,12 +4402,10 @@ public class CarrierConfigManager {
"carrier_auto_cancel_cs_notification";
/**
* Passing this value as {@link KEY_SUBSCRIPTION_GROUP_UUID_STRING} will remove the
* Passing this value as {@link #KEY_SUBSCRIPTION_GROUP_UUID_STRING} will remove the
* subscription from a group instead of adding it to a group.
*
* TODO: Expose in a future release.
*
* @hide
* <p>This value will work all the way back to {@link android.os.Build.VERSION_CODES#Q}.
*/
public static final String REMOVE_GROUP_UUID_STRING = "00000000-0000-0000-0000-000000000000";
@ -4420,9 +4418,7 @@ public class CarrierConfigManager {
* <p>If set to {@link #REMOVE_GROUP_UUID_STRING}, then the subscription will be removed from
* its current group.
*
* TODO: unhide this key.
*
* @hide
* <p>This key will work all the way back to {@link android.os.Build.VERSION_CODES#Q}.
*/
public static final String KEY_SUBSCRIPTION_GROUP_UUID_STRING =
"subscription_group_uuid_string";
@ -4447,17 +4443,15 @@ public class CarrierConfigManager {
"data_switch_validation_min_gap_long";
/**
* A boolean property indicating whether this subscription should be managed as an opportunistic
* subscription.
*
* If true, then this subscription will be selected based on available coverage and will not be
* available for a user in settings menus for selecting macro network providers. If unset,
* defaults to “false”.
*
* TODO: unhide this key.
*
* @hide
*/
* A boolean property indicating whether this subscription should be managed as an opportunistic
* subscription.
*
* If true, then this subscription will be selected based on available coverage and will not be
* available for a user in settings menus for selecting macro network providers. If unset,
* defaults to “false”.
*
* <p>This key will work all the way back to {@link android.os.Build.VERSION_CODES#Q}.
*/
public static final String KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL =
"is_opportunistic_subscription_bool";