Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add carrier config for auto redialing 911"

Browse Source 
am: b91316f203

Change-Id: Ie77021a09bb896faaa5fc5686563b0ddbf645d48
This commit is contained in:
Hall Liu
2018-07-26 17:52:16 -07:00
committed by android-build-merger
parent d5ca549d47 b91316f203
commit 9e76e3acb9
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1465,6 +1465,15 @@ public class CarrierConfigManager {
public static final String KEY_ALWAYS_PLAY_REMOTE_HOLD_TONE_BOOL = public static final String KEY_ALWAYS_PLAY_REMOTE_HOLD_TONE_BOOL =
"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 * 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
@@ -1993,6 +2002,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL, true); sDefaults.putBoolean(KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL, true);
sDefaults.putBoolean(KEY_CARRIER_ALLOW_DEFLECT_IMS_CALL_BOOL, false); sDefaults.putBoolean(KEY_CARRIER_ALLOW_DEFLECT_IMS_CALL_BOOL, false);
sDefaults.putBoolean(KEY_ALWAYS_PLAY_REMOTE_HOLD_TONE_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_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);