diff --git a/core/api/current.txt b/core/api/current.txt index ffecc090067f2..6f68329567472 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -41323,7 +41323,7 @@ package android.telephony { field public static final String KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY = "gsm_roaming_networks_string_array"; field public static final String KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL = "has_in_call_noise_suppression_bool"; field public static final String KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_bool"; - field public static final String KEY_HIDE_ENABLE_2G = "hide_enable_2g_bool"; + field @Deprecated public static final String KEY_HIDE_ENABLE_2G = "hide_enable_2g_bool"; 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"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index bb0522c4dec9b..bd993f213f2de 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -8478,7 +8478,12 @@ public class CarrierConfigManager { * * Used to trade privacy/security against potentially reduced carrier coverage for some * carriers. + * + * @deprecated Future versions of Android will disallow carriers from hiding this toggle + * because disabling 2g is a security feature that users should always have access to at + * their discretion. */ + @Deprecated public static final String KEY_HIDE_ENABLE_2G = "hide_enable_2g_bool"; /**