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

Merge "[CCM][Provider Model] Rename no-calling icon configuration key" into sc-dev

Browse Source
This commit is contained in:
Etan Cohen
2021-04-06 20:20:44 +00:00
committed by Android (Google) Code Review
parent 3f33c7f267 f6466c18dc
commit 208e88a5b9
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -40776,7 +40776,6 @@ package android.telephony {
field public static final String KEY_HIDE_ENHANCED_4G_LTE_BOOL = "hide_enhanced_4g_lte_bool";
field public static final String KEY_HIDE_IMS_APN_BOOL = "hide_ims_apn_bool";
field public static final String KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL = "hide_lte_plus_data_icon_bool";
field public static final String KEY_HIDE_NO_CALLING_INDICATOR_ON_DATA_NETWORK_BOOL = "hide_no_calling_indicator_on_data_network_bool";
field public static final String KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL = "hide_preferred_network_type_bool";
field public static final String KEY_HIDE_PRESET_APN_DETAILS_BOOL = "hide_preset_apn_details_bool";
field public static final String KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool";
@@ -40892,6 +40891,7 @@ package android.telephony {
field public static final String KEY_UNLOGGABLE_NUMBERS_STRING_ARRAY = "unloggable_numbers_string_array";
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_IP_FOR_CALLING_INDICATOR_BOOL = "use_ip_for_calling_indicator_bool";
field public static final String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_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";

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

@@ -4881,14 +4881,15 @@ public class CarrierConfigManager {
/**
* Determines whether or not to use (IP) data connectivity as a supplemental condition to
* control the visibility of the no-calling indicator for this carrier in the System UI. Setting
* the configuration to true may make sense to a carrier which provides OTT calling.
* the configuration to true may make sense for carriers that provide OTT calling.
*
* Config = true: do not show no-calling indication if (IP) data connectivity is available
* or telephony has voice registration.
* Config = false: do not show no-calling indication if telephony has voice registration.
* Config = true: show no-calling indication only if telephony does not have voice registration
* and if no (IP) data connectivity is available.
* Config = false: show no-calling indication only if telephony does not have voice
* registration.
*/
public static final String KEY_HIDE_NO_CALLING_INDICATOR_ON_DATA_NETWORK_BOOL =
"hide_no_calling_indicator_on_data_network_bool";
public static final String KEY_USE_IP_FOR_CALLING_INDICATOR_BOOL =
"use_ip_for_calling_indicator_bool";
/**
* Determine whether or not to display a call strength indicator for this carrier in the System
@@ -5484,7 +5485,7 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_ALLOWED_INITIAL_ATTACH_APN_TYPES_STRING_ARRAY,
new String[]{"ia", "default", "ims", "mms", "dun", "emergency"});
sDefaults.putBoolean(KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL, false);
sDefaults.putBoolean(KEY_HIDE_NO_CALLING_INDICATOR_ON_DATA_NETWORK_BOOL, false);
sDefaults.putBoolean(KEY_USE_IP_FOR_CALLING_INDICATOR_BOOL, false);
sDefaults.putBoolean(KEY_DISPLAY_CALL_STRENGTH_INDICATOR_BOOL, true);
sDefaults.putString(KEY_CARRIER_PROVISIONING_APP_STRING, "");
sDefaults.putBoolean(KEY_DISPLAY_NO_DATA_NOTIFICATION_ON_PERMANENT_FAILURE_BOOL, false);