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

Commit 0819bac2 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Only make a subset of Call Barring options visible per carrier 

Some carriers do not support changing the password and
deactivating all call barring options using the "Call Barring" UI.
These options aren't available over the UT interface, so
the options are always grayed out.

Adds KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL and
KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL keys to the
CarrierConfigManager to handle these two cases.

Test: disable carrier configs manually and check UI
Bug: 80510612
Change-Id: I0190f15107ae1828ba98902ca10ed4128fb71dbf
parent 908020e9

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -41695,6 +41695,9 @@ package android.telephony { 
    field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";

    field public static final java.lang.String KEY_APN_EXPAND_BOOL = "apn_expand_bool";

    field public static final java.lang.String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";

    field public static final java.lang.String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL = "call_barring_supports_deactivate_all_bool";

    field public static final java.lang.String KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL = "call_barring_supports_password_change_bool";

    field public static final java.lang.String KEY_CALL_BARRING_VISIBILITY_BOOL = "call_barring_visibility_bool";

    field public static final java.lang.String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array";

    field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";

    field public static final java.lang.String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings";

telephony/java/android/telephony/CarrierConfigManager.java

+25 −2
Original line number Diff line number Diff line
@@ -107,12 +107,33 @@ public class CarrierConfigManager { 


   /**

    * Boolean indicating if the "Call barring" item is visible in the Call Settings menu.

    * true means visible. false means gone.

    * @hide

    * If true, the "Call Barring" menu will be visible. If false, the menu will be gone.

    *

    * Disabled by default.

    */

    public static final String KEY_CALL_BARRING_VISIBILITY_BOOL =

            "call_barring_visibility_bool";



    /**

     * Flag indicating whether or not changing the call barring password via the "Call Barring"

     * settings menu is supported. If true, the option will be visible in the "Call

     * Barring" settings menu. If false, the option will not be visible.

     *

     * Enabled by default.

     */

    public static final String KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL =

            "call_barring_supports_password_change_bool";



    /**

     * Flag indicating whether or not deactivating all call barring features via the "Call Barring"

     * settings menu is supported. If true, the option will be visible in the "Call

     * Barring" settings menu. If false, the option will not be visible.

     *

     * Enabled by default.

     */

    public static final String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL =

            "call_barring_supports_deactivate_all_bool";



    /**

     * Flag indicating whether the Phone app should ignore EVENT_SIM_NETWORK_LOCKED

     * events from the Sim.
@@ -2109,6 +2130,8 @@ public class CarrierConfigManager { 


        sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONED_BOOL, false);

        sDefaults.putBoolean(KEY_CALL_BARRING_VISIBILITY_BOOL, false);

        sDefaults.putBoolean(KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL, true);

        sDefaults.putBoolean(KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL, true);

        sDefaults.putBoolean(KEY_CALL_FORWARDING_VISIBILITY_BOOL, true);

        sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL, true);

        sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL, true);