From 2ee968289ee2cd1ab20514df08ea37e19e1cd210 Mon Sep 17 00:00:00 2001 From: taiki tsutsumi Date: Mon, 2 Jul 2018 17:15:42 +0900 Subject: [PATCH] Add CarrierConfig to hide Preset APN setting details Add new key to hide Preset APN setting details. When the key is set to true, Preset APN is still shown and selectable in APN list, however, user cannot enter APN editor view. It means details of Preset APN will be hidden from user. Test: manual - check Preset APN setting details are hidden Bug: 115453290 Change-Id: I8a5c6f92f876d349b304acf89b4ffab86ff3f24b --- api/current.txt | 1 + .../java/android/telephony/CarrierConfigManager.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/api/current.txt b/api/current.txt index 3c014cbd6ee75..fd6184fdc5fd9 100755 --- a/api/current.txt +++ b/api/current.txt @@ -42106,6 +42106,7 @@ package android.telephony { field public static final java.lang.String KEY_HIDE_ENHANCED_4G_LTE_BOOL = "hide_enhanced_4g_lte_bool"; field public static final java.lang.String KEY_HIDE_IMS_APN_BOOL = "hide_ims_apn_bool"; field public static final java.lang.String KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL = "hide_preferred_network_type_bool"; + field public static final java.lang.String KEY_HIDE_PRESET_APN_DETAILS_BOOL = "hide_preset_apn_details_bool"; field public static final java.lang.String KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool"; field public static final java.lang.String KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL = "ignore_sim_network_locked_events_bool"; field public static final java.lang.String KEY_IMS_CONFERENCE_SIZE_LIMIT_INT = "ims_conference_size_limit_int"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 90c15ffa44c16..3b44463c85f86 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1827,6 +1827,13 @@ public class CarrierConfigManager { public static final String KEY_NOTIFY_INTERNATIONAL_CALL_ON_WFC_BOOL = "notify_international_call_on_wfc_bool"; + /** + * Flag to hide Preset APN details. If true, user cannot enter ApnEditor view of Preset APN, + * and cannot view details of the APN. If false, user can enter ApnEditor view of Preset APN. + * Default value is false. + */ + public static final String KEY_HIDE_PRESET_APN_DETAILS_BOOL = "hide_preset_apn_details_bool"; + /** * Flag specifying whether to show an alert dialog for video call charges. * By default this value is {@code false}. @@ -2595,6 +2602,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_DISPLAY_VOICEMAIL_NUMBER_AS_DEFAULT_CALL_FORWARDING_NUMBER_BOOL, false); sDefaults.putBoolean(KEY_NOTIFY_INTERNATIONAL_CALL_ON_WFC_BOOL, false); + sDefaults.putBoolean(KEY_HIDE_PRESET_APN_DETAILS_BOOL, false); sDefaults.putBoolean(KEY_SHOW_VIDEO_CALL_CHARGES_ALERT_DIALOG_BOOL, false); sDefaults.putStringArray(KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY, null);