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

resolve merge conflicts of 80a0e6d to nyc-mr2-dev-plus-aosp

Browse Source 
Test: telephony unit tests
Change-Id: Id4454c97eca5f0261001369d0ec5030775bf9887
This commit is contained in:
Jack Yu
2016-11-18 09:22:39 -08:00
parent b011af9573 80a0e6d56e
commit cba59432ba
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,6 +293,14 @@ public class CarrierConfigManager {
*/ */
public static final String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string"; public static final String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";
/**
* Flag indicating whether we should downgrade/terminate VT calls and disable VT when
* data enabled changed (e.g. reach data limit or turn off data).
* @hide
*/
public static final String KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS =
"ignore_data_enabled_changed_for_video_calls";
/** /**
* Flag specifying whether WFC over IMS should be available for carrier: independent of * Flag specifying whether WFC over IMS should be available for carrier: independent of
* carrier provisioning. If false: hard disabled. If true: then depends on carrier * carrier provisioning. If false: hard disabled. If true: then depends on carrier
@@ -1058,6 +1066,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_NOTIFY_HANDOVER_VIDEO_FROM_WIFI_TO_LTE_BOOL, false); sDefaults.putBoolean(KEY_NOTIFY_HANDOVER_VIDEO_FROM_WIFI_TO_LTE_BOOL, false);
sDefaults.putBoolean(KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL, true); sDefaults.putBoolean(KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL, true);
sDefaults.putString(KEY_DEFAULT_VM_NUMBER_STRING, ""); sDefaults.putString(KEY_DEFAULT_VM_NUMBER_STRING, "");
sDefaults.putBoolean(KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS, false);
sDefaults.putBoolean(KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, false); sDefaults.putBoolean(KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL, false); sDefaults.putBoolean(KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_DEFAULT_WFC_IMS_ENABLED_BOOL, false); sDefaults.putBoolean(KEY_CARRIER_DEFAULT_WFC_IMS_ENABLED_BOOL, false);