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 
Change-Id: Ief51ceeeae7a11e26dd2c53411ce67e6d0e6bd49
This commit is contained in:
Jordan Liu
2016-10-26 11:24:54 -07:00
parent b5fed003cc ab005465b6
commit bc2af49c21
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/res/res/values/config.xml
View File

@@ -2290,21 +2290,6 @@
<item>SUPL_MODE=1</item>
</string-array>
<!-- If there is no preload VM number in the sim card, carriers such as
Verizon require to load a default vm number from the configurantion.
Define config_default_vm_number for this purpose. And there are two
optional formats for this configuration as below:
(1)<item>voicemail number</item>
(2)<item>voicemail number;gid</item>
The logic to pick up the correct voicemail number:
(1) If the config_default_vm_number array has no gid special item, the last one will be
picked
(2) If the config_default_vm_number array has gid special item and it matches the current
sim's gid, it will be picked.
(3) If the config_default_vm_number array has gid special item but it doesn't match the
current sim's gid, the last one without gid will be picked -->
<string-array translatable="false" name="config_default_vm_number" />
<!-- Sprint need a 70 ms delay for 3way call -->
<integer name="config_cdma_3waycall_flash_delay">0</integer>

1
core/res/res/values/symbols.xml
View File

@@ -2264,7 +2264,6 @@
<java-symbol type="bool" name="config_auto_attach_data_on_creation" />
<java-symbol type="attr" name="closeItemLayout" />
<java-symbol type="layout" name="resolver_different_item_header" />
<java-symbol type="array" name="config_default_vm_number" />
<java-symbol type="integer" name="config_cdma_3waycall_flash_delay"/>
<java-symbol type="array" name="config_default_vm_number" />
<java-symbol type="attr" name="windowBackgroundFallback" />

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
@@ -1032,6 +1040,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);