From dc6608eb2196a8c7638b3b69d579945f280ee70d Mon Sep 17 00:00:00 2001 From: Gil Cukierman Date: Mon, 24 Oct 2022 15:38:17 -0400 Subject: Deprecate CarrierConfigManager.KEY_HIDE_ENABLE_2G Bug: b/250952448 Test: Marking for deprecation. Tests still pass. Change-Id: Ic84576d33476cbf5ab1f96feaa13b4db897e75c1 --- core/api/current.txt | 2 +- telephony/java/android/telephony/CarrierConfigManager.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/api/current.txt b/core/api/current.txt index 93cb7e45a047..ffc3490de4c2 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -41322,7 +41322,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 8e6d6a81e579..42c445a36031 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -8472,7 +8472,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"; /** -- cgit v1.2.3-59-g8ed1b