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

Commit 70ac1bd1 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Add carrier config to always play hold tone when remotely held." am:... 

Merge "Add carrier config to always play hold tone when remotely held." am: c352f5f8 am: c9187f91
am: e31e0d5a

Change-Id: Ic14315ea8a85fe9108e765fb32ce23b68ff31756
parents 4c2009c2 e31e0d5a

telephony/java/android/telephony/CarrierConfigManager.java

+14 −0
Original line number Original line Diff line number Diff line
@@ -1310,6 +1310,19 @@ public class CarrierConfigManager { 
     */

     */

    public static final String KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL = "allow_hold_in_ims_call";

    public static final String KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL = "allow_hold_in_ims_call";







    /**

     * Flag indicating whether the carrier always wants to play an "on-hold" tone when a call has

     * been remotely held.

     * <p>

     * When {@code true}, if the IMS stack indicates that the call session has been held, a signal

     * will be sent from Telephony to play an audible "on-hold" tone played to the user.

     * When {@code false}, a hold tone will only be played if the audio session becomes inactive.

     * @hide

     */

    public static final String KEY_ALWAYS_PLAY_REMOTE_HOLD_TONE_BOOL =

            "always_play_remote_hold_tone_bool";



    /**

    /**

     * When true, indicates that adding a call is disabled when there is an ongoing video call

     * When true, indicates that adding a call is disabled when there is an ongoing video call

     * or when there is an ongoing call on wifi which was downgraded from video and VoWifi is

     * or when there is an ongoing call on wifi which was downgraded from video and VoWifi is
@@ -1706,6 +1719,7 @@ public class CarrierConfigManager { 
    static {

    static {

        sDefaults = new PersistableBundle();

        sDefaults = new PersistableBundle();

        sDefaults.putBoolean(KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_ALWAYS_PLAY_REMOTE_HOLD_TONE_BOOL, false);

        sDefaults.putBoolean(KEY_ADDITIONAL_CALL_SETTING_BOOL, true);

        sDefaults.putBoolean(KEY_ADDITIONAL_CALL_SETTING_BOOL, true);

        sDefaults.putBoolean(KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL, false);

        sDefaults.putBoolean(KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL, false);

        sDefaults.putBoolean(KEY_ALLOW_LOCAL_DTMF_TONES_BOOL, true);

        sDefaults.putBoolean(KEY_ALLOW_LOCAL_DTMF_TONES_BOOL, true);