diff options
| author | 2021-03-21 23:37:16 +0000 | |
|---|---|---|
| committer | 2021-03-23 00:19:07 +0000 | |
| commit | 4fd6297369cdd227b71efe89659ca07b9c26ec5f (patch) | |
| tree | 353a4bf9eb78dac771bcfaf70d6b3bf075eb99f2 | |
| parent | 80e8713490d1567d4e0de354414698744f5a5933 (diff) | |
[Provider Model] Carrier configurations for no calling indicator
Add carrier configuration manager attributes to control whether the
no calling indicator is used in the System UI and Settings.
Bug: 181277417
Test: builds
Change-Id: If2ffb6144e4e88b69b3866f74016b47ef8b6c7f3
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 7acad18752ed..234d61e88520 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -40465,6 +40465,7 @@ 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"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 04a0abac9b57..76d4c53b7911 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -4849,6 +4849,18 @@ public class CarrierConfigManager { public static final String KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL = "carrier_provisions_wifi_merged_networks_bool"; + /** + * 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. + * + * 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. + */ + public static final String KEY_HIDE_NO_CALLING_INDICATOR_ON_DATA_NETWORK_BOOL = + "hide_no_calling_indicator_on_data_network_bool"; + /** The default value for every variable. */ private final static PersistableBundle sDefaults; @@ -5422,6 +5434,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.putString(KEY_CARRIER_PROVISIONING_APP_STRING, ""); } |