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

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

Browse Source 
am: c9187f9199

Change-Id: Ic5b3a6089b03771bb0c0e48e0e8e01cbca839b47
This commit is contained in:
Tyler Gunn
2017-12-12 01:27:00 +00:00
committed by android-build-merger
parent 486385092b c9187f9199
commit e31e0d5a7a
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1304,6 +1304,19 @@ public class CarrierConfigManager {
*/
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
* or when there is an ongoing call on wifi which was downgraded from video and VoWifi is
@@ -1700,6 +1713,7 @@ public class CarrierConfigManager {
static {
sDefaults = new PersistableBundle();
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_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL, false);
sDefaults.putBoolean(KEY_ALLOW_LOCAL_DTMF_TONES_BOOL, true);