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

Merge commit '024557b2afdbe2e946d2cc557cb71492d87b0f62' into mncvtdev-to-mmwirelessdev-merge-2015-12-10

Browse Source 
Change-Id: I44853f0e2f56d33c8126de0799bd5129799592bd
This commit is contained in:
Tyler Gunn
2015-12-10 20:02:16 -08:00
parent 6c6f9e7a9a 024557b2af
commit fb21fb73e9
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -32825,6 +32825,8 @@ package android.telephony {
method public void notifyConfigChangedForSubId(int);
method public void updateConfigForPhoneId(int, java.lang.String);
field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";
field public static final java.lang.String BOOL_ALLOW_VIDEO_PAUSE = "bool_allow_video_pause";
field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";
field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";
field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";

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

@@ -498,6 +498,30 @@ public class CarrierConfigManager {
*/
public static final String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL =
"allow_non_emergency_calls_in_ecm_bool";
/**
* Flag indicating whether to allow carrier video calls to emergency numbers.
* When {@code true}, video calls to emergency numbers will be allowed. When {@code false},
* video calls to emergency numbers will be initiated as audio-only calls instead.
*
* @hide
*/
@SystemApi
public static final String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS =
"bool_allow_emergency_video_calls";
/**
* Flag indicating whether the carrier supports video pause signaling. When {@code true}, the
* carrier supports use of the {@link android.telecom.VideoProfile#STATE_PAUSED} video state
* to pause transmission of video when the In-Call app is sent to the background.
* When {@code false}, video pause signaling is not supported. {@code True} by default unless
* a carrier configuration overrides the default.
*
* @hide
*/
@SystemApi
public static final String BOOL_ALLOW_VIDEO_PAUSE =
"bool_allow_video_pause";
/** The default value for every variable. */
private final static PersistableBundle sDefaults;
@@ -569,6 +593,8 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_HIDE_IMS_APN_BOOL, false);
sDefaults.putBoolean(KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL, false);
sDefaults.putInt(KEY_CDMA_DTMF_TONE_DELAY_INT, 100);
sDefaults.putBoolean(BOOL_ALLOW_EMERGENCY_VIDEO_CALLS, false);
sDefaults.putBoolean(BOOL_ALLOW_VIDEO_PAUSE, true);
// MMS defaults
sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);