Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c2adf5c authored by rambowang's avatar rambowang
Browse files

Guard exposed carrier configs with aconfig flag 

The following carrier configs for additional call settings
are guarded with aconfig flag:
- KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL
- KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL

Bug: 310264981
Test: atest FrameworkTelephonyTests and CtsTelephonyTestCases
Change-Id: Ic32924d3c49cada9819a410e0ae7d50382dd7130
parent 60896b97

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -43083,8 +43083,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 @FlaggedApi("com.android.internal.telephony.flags.show_call_id_and_call_waiting_in_additional_settings_menu") public static final String KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL = "additional_settings_caller_id_visibility_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.show_call_id_and_call_waiting_in_additional_settings_menu") 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";

telephony/java/android/telephony/CarrierConfigManager.java

+2 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ public class CarrierConfigManager { 
     *

     * The default value is true.

     */

    @FlaggedApi(Flags.FLAG_SHOW_CALL_ID_AND_CALL_WAITING_IN_ADDITIONAL_SETTINGS_MENU)

    public static final String KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL =

            "additional_settings_caller_id_visibility_bool";









@@ -261,6 +262,7 @@ public class CarrierConfigManager {













     *















     * The default value is true.















     */













    @FlaggedApi(Flags.FLAG_SHOW_CALL_ID_AND_CALL_WAITING_IN_ADDITIONAL_SETTINGS_MENU)















    public static final String KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL =















            "additional_settings_call_waiting_visibility_bool";