From 1ebc11391fa51372faaab7a9e1c1cd104dd15726 Mon Sep 17 00:00:00 2001 From: rambowang Date: Thu, 26 Jan 2023 13:01:21 -0600 Subject: Expose two carrier configs for additional call settings Expose KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL and KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL so carriers that don't support the feature can override them to false to hide the feature in calling addtional settings. Bug: 266479292 Test: m -j Change-Id: I9ae635c051c0f9e180c36aa1725d0f058f1fd70d Merged-In: I9ae635c051c0f9e180c36aa1725d0f058f1fd70d (cherry picked from commit c86c69b1d180a8ba3a6e735321127755e1b7bbee) --- core/api/current.txt | 2 ++ telephony/java/android/telephony/CarrierConfigManager.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index abf3a2f0ddf8..d0919b05314d 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -41314,6 +41314,8 @@ package android.telephony { field public static final String KEY_5G_NR_SSRSRQ_THRESHOLDS_INT_ARRAY = "5g_nr_ssrsrq_thresholds_int_array"; field public static final String KEY_5G_NR_SSSINR_THRESHOLDS_INT_ARRAY = "5g_nr_sssinr_thresholds_int_array"; field public static final String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool"; + field public static final String KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL = "additional_settings_caller_id_visibility_bool"; + field public static final String KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL = "additional_settings_call_waiting_visibility_bool"; field public static final String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool"; field public static final String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call"; field public static final String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 318b01aad076..34a901c69f77 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -244,7 +244,8 @@ public class CarrierConfigManager { /** * Boolean indicating if the "Caller ID" item is visible in the Additional Settings menu. * true means visible. false means gone. - * @hide + * + * The default value is true. */ public static final String KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL = "additional_settings_caller_id_visibility_bool"; @@ -252,7 +253,8 @@ public class CarrierConfigManager { /** * Boolean indicating if the "Call Waiting" item is visible in the Additional Settings menu. * true means visible. false means gone. - * @hide + * + * The default value is true. */ public static final String KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL = "additional_settings_call_waiting_visibility_bool"; -- cgit v1.2.3-59-g8ed1b