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

Commit b6027f29 authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "Supplementary Services(SS) gray out when airplane mode on in Call Settings menu."

parents ff50783e 08972c5b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -44535,6 +44535,7 @@ package android.telephony { 
    field public static final String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";

    field public static final String KEY_DIAL_STRING_REPLACE_STRING_ARRAY = "dial_string_replace_string_array";

    field public static final String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";

    field public static final String KEY_DISABLE_SUPPLEMENTARY_SERVICES_IN_AIRPLANE_MODE_BOOL = "disable_supplementary_services_in_airplane_mode_bool";

    field public static final String KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY = "disconnect_cause_play_busytone_int_array";

    field public static final String KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL = "display_hd_audio_property_bool";

    field public static final String KEY_DROP_VIDEO_CALL_WHEN_ANSWERING_AUDIO_CALL_BOOL = "drop_video_call_when_answering_audio_call_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Diff line number Diff line
@@ -99,6 +99,16 @@ public class CarrierConfigManager { 
    public static final String

            KEY_CARRIER_VOLTE_PROVISIONED_BOOL = "carrier_volte_provisioned_bool";



    /**

     * Boolean indicating the Supplementary Services(SS) is disable when airplane mode on in the

     * Call Settings menu.

     * {@code true}: SS is disable when airplane mode on.

     * {@code false}: SS is enable when airplane mode on.

     * The default value for this key is {@code false}

     */

    public static final String KEY_DISABLE_SUPPLEMENTARY_SERVICES_IN_AIRPLANE_MODE_BOOL =

            "disable_supplementary_services_in_airplane_mode_bool";



    /**

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

     * true means visible. false means gone.
@@ -3439,6 +3449,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_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_DISABLE_SUPPLEMENTARY_SERVICES_IN_AIRPLANE_MODE_BOOL, false);

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