From 6e164b4da37126a478994e16471295a05bcf0ee6 Mon Sep 17 00:00:00 2001 From: rambowang Date: Wed, 17 Aug 2022 16:28:12 -0500 Subject: [PATCH] Deprecate carrier config KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL The carrier config key was introduced in Oreo release without an implementation. It has no behavior impact when carriers override this carrier config, mismatching what it was delared in its documentation. This CC key should be cleared up, not only to keep a healthy public API surface, but also avoid confusing carriers who may try to override the CC key to expect a behavior change. Bug: 242755061 Test: make offline-sdk-docs Change-Id: Ib30091753eda7dbe30ecc037d4303bf99a4ad3cc --- core/api/current.txt | 2 +- telephony/java/android/telephony/CarrierConfigManager.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/api/current.txt b/core/api/current.txt index 47b66a4c6fe64..7fac09e76ed2e 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -41572,7 +41572,7 @@ package android.telephony { field public static final String KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL = "show_signal_strength_in_sim_status_bool"; field public static final String KEY_SHOW_VIDEO_CALL_CHARGES_ALERT_DIALOG_BOOL = "show_video_call_charges_alert_dialog_bool"; field public static final String KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL = "show_wfc_location_privacy_policy_bool"; - field public static final String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool"; + field @Deprecated public static final String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool"; field public static final String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool"; field public static final String KEY_SMDP_SERVER_ADDRESS_STRING = "smdp_server_address_string"; field public static final String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 70b51239b7143..b6944eb17b0cd 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -489,7 +489,10 @@ public class CarrierConfigManager { /** * Control whether users receive a simplified network settings UI and improved network * selection. + * + * @deprecated Never implemented. Has no behavior impact when override. DO NOT USE. */ + @Deprecated public static final String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";