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

Commit 02fca08c authored by Saki Oomori's avatar Saki Oomori Committed by android-build-merger
Browse files

Add new carrier config to extend DisconnectCause to play busy tone 

am: 63bb8561

Change-Id: I80224cbf453b156676458538cd0bc5c05be4a296
parents 8c2efe41 63bb8561

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -44257,6 +44257,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_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";

    field public static final String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -3199,6 +3199,13 @@ public class CarrierConfigManager { 
    public static final String KEY_CARRIER_CERTIFICATE_STRING_ARRAY =

            "carrier_certificate_string_array";



    /**

     * DisconnectCause array to play busy tone. Value should be array of

     * {@link android.telephony.DisconnectCause}.

     */

    public static final String KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY =

            "disconnect_cause_play_busytone_int_array";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -3628,6 +3635,8 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_SUPPORT_WPS_OVER_IMS_BOOL, true);

        sDefaults.putAll(Ims.getDefaults());

        sDefaults.putStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY, null);

        sDefaults.putIntArray(KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY,

                new int[] {4 /* BUSY */});

    }



    /**