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

Commit 843e54f9 authored by SongFerng Wang's avatar SongFerng Wang Committed by android-build-merger
Browse files

Merge "add three new carrier configs for call forwarding, Caller ID and Call... 

Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev am: d7b59466
am: fce00ebc

Change-Id: I346193114b57f7eb1e06cc3b013eff0ada806f5c
parents 349471a1 fce00ebc

telephony/java/android/telephony/CarrierConfigManager.java

+27 −0
Original line number Diff line number Diff line
@@ -80,6 +80,30 @@ public class CarrierConfigManager { 
    public static final String

            KEY_CARRIER_VOLTE_PROVISIONED_BOOL = "carrier_volte_provisioned_bool";



    /**

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

     * true means visible. false means gone.

     * @hide

     */

    public static final String KEY_CALL_FORWARDING_VISIBILITY_BOOL =

            "call_forwarding_visibility_bool";



    /**

     * Boolean indicating if the "Caller ID" item is visible in the Additional Settings menu.

     * true means visible. false means gone.

     * @hide

     */

    public static final String KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL =

            "additional_settings_caller_id_visibility_bool";



    /**

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

     * true means visible. false means gone.

     * @hide

     */

    public static final String KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL =

            "additional_settings_call_waiting_visibility_bool";



   /**

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

    * true means visible. false means gone.
@@ -2046,6 +2070,9 @@ public class CarrierConfigManager { 


        sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONED_BOOL, false);

        sDefaults.putBoolean(KEY_CALL_BARRING_VISIBILITY_BOOL, false);

        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);

        sDefaults.putBoolean(KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL, false);

        sDefaults.putBoolean(KEY_MDN_IS_ADDITIONAL_VOICEMAIL_NUMBER_BOOL, false);

        sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);