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

resolve merge conflicts of ab00546 to stage-aosp-master

Browse Source 
am: bc2af49c21

Change-Id: I95cfcd3907105ef1969f02bf1229ba0c5eb9b8c7
This commit is contained in:
Jordan Liu
2016-10-26 20:12:56 +00:00
committed by android-build-merger
parent bb139c5633 bc2af49c21
commit ff13cc20fe
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,6 +285,14 @@ public class CarrierConfigManager {
public static final String KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL =
"support_downgrade_vt_to_audio_bool";
/**
* Where there is no preloaded voicemail number on a SIM card, specifies the carrier's default
* voicemail number.
* When empty string, no default voicemail number is specified.
* @hide
*/
public static final String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";
/**
* 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
@@ -1042,6 +1050,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_CARRIER_VT_AVAILABLE_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.putString(KEY_DEFAULT_VM_NUMBER_STRING, "");
sDefaults.putBoolean(KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_DEFAULT_WFC_IMS_ENABLED_BOOL, false);