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

Commit 84bac8ea authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Add carrier config for auto redialing 911" am: b91316f2 am: 9e76e3ac am: 36af741a 

am: c99da79b

Change-Id: Ibafa3ab93c00e53bd648a0da5973dee6f27287e4
parents 306afa86 c99da79b

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -1492,6 +1492,15 @@ public class CarrierConfigManager { 
    public static final String KEY_ALWAYS_PLAY_REMOTE_HOLD_TONE_BOOL =

            "always_play_remote_hold_tone_bool";



    /**

     * When true, the Telephony stack will automatically turn off airplane mode and retry a wifi

     * emergency call over the cell network if the initial attempt at dialing was met with a SIP 308

     * error.

     * @hide

     */

    public static final String KEY_AUTO_RETRY_FAILED_WIFI_EMERGENCY_CALL =

            "auto_retry_failed_wifi_emergency_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
@@ -2029,6 +2038,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_CARRIER_ALLOW_DEFLECT_IMS_CALL_BOOL, false);

        sDefaults.putBoolean(KEY_ALWAYS_PLAY_REMOTE_HOLD_TONE_BOOL, false);

        sDefaults.putBoolean(KEY_AUTO_RETRY_FAILED_WIFI_EMERGENCY_CALL, false);

        sDefaults.putBoolean(KEY_ADDITIONAL_CALL_SETTING_BOOL, true);

        sDefaults.putBoolean(KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL, false);

        sDefaults.putBoolean(KEY_ALLOW_LOCAL_DTMF_TONES_BOOL, true);