diff options
| author | 2022-11-09 21:36:01 +0000 | |
|---|---|---|
| committer | 2022-11-09 21:36:01 +0000 | |
| commit | 4d0ee1d0a78bb0108e3e5edd2b7da6687dc86b16 (patch) | |
| tree | a3ac19ce8262e1ae1053a0a798267ccd1b6e2945 | |
| parent | 9b12a745f43f4ad8c12348a85d44d64ed2fccde7 (diff) | |
| parent | 09762c6ac6252945a470f036f6e0a7eacf51e263 (diff) | |
Merge "Deprecate CarrierConfigManager.KEY_HIDE_ENABLE_2G" am: 09762c6ac6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2268206
Change-Id: I71da73d928c29072bbc3f879c2273cbfa4370199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index ffecc090067f..6f6832956747 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 bb0522c4dec9..bd993f213f2d 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"; /** |