Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" (281fbc20) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36881,6 +36881,7 @@ package android.telephony {
	field public static final java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";		field public static final java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
	field public static final java.lang.String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool";		field public static final java.lang.String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool";
	field public static final java.lang.String KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL = "carrier_wfc_supports_wifi_only_bool";		field public static final java.lang.String KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL = "carrier_wfc_supports_wifi_only_bool";
			field public static final java.lang.String KEY_CDMA_3WAYCALL_FLASH_DELAY_INT = "cdma_3waycall_flash_delay_int";
	field public static final java.lang.String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";		field public static final java.lang.String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";
	field public static final java.lang.String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";		field public static final java.lang.String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";
	field public static final java.lang.String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";		field public static final java.lang.String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";

api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39963,6 +39963,7 @@ package android.telephony {
	field public static final java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";		field public static final java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
	field public static final java.lang.String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool";		field public static final java.lang.String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool";
	field public static final java.lang.String KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL = "carrier_wfc_supports_wifi_only_bool";		field public static final java.lang.String KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL = "carrier_wfc_supports_wifi_only_bool";
			field public static final java.lang.String KEY_CDMA_3WAYCALL_FLASH_DELAY_INT = "cdma_3waycall_flash_delay_int";
	field public static final java.lang.String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";		field public static final java.lang.String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";
	field public static final java.lang.String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";		field public static final java.lang.String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";
	field public static final java.lang.String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";		field public static final java.lang.String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";

api/test-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36961,6 +36961,7 @@ package android.telephony {
	field public static final java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";		field public static final java.lang.String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
	field public static final java.lang.String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool";		field public static final java.lang.String KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL = "carrier_wfc_ims_available_bool";
	field public static final java.lang.String KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL = "carrier_wfc_supports_wifi_only_bool";		field public static final java.lang.String KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL = "carrier_wfc_supports_wifi_only_bool";
			field public static final java.lang.String KEY_CDMA_3WAYCALL_FLASH_DELAY_INT = "cdma_3waycall_flash_delay_int";
	field public static final java.lang.String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";		field public static final java.lang.String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";
	field public static final java.lang.String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";		field public static final java.lang.String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";
	field public static final java.lang.String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";		field public static final java.lang.String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";

core/res/res/values/config.xml

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2269,6 +2269,21 @@
	<!-- Sprint need a 70 ms delay for 3way call -->		<!-- Sprint need a 70 ms delay for 3way call -->
	<integer name="config_cdma_3waycall_flash_delay">0</integer>		<integer name="config_cdma_3waycall_flash_delay">0</integer>

			<!-- 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" />

	<!--SIM does not save, but the voice mail number to be changed. -->		<!--SIM does not save, but the voice mail number to be changed. -->
	<bool name="editable_voicemailnumber">false</bool>		<bool name="editable_voicemailnumber">false</bool>

core/res/res/values/symbols.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2267,6 +2267,7 @@
	<java-symbol type="attr" name="closeItemLayout" />		<java-symbol type="attr" name="closeItemLayout" />
	<java-symbol type="layout" name="resolver_different_item_header" />		<java-symbol type="layout" name="resolver_different_item_header" />
	<java-symbol type="integer" name="config_cdma_3waycall_flash_delay"/>		<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" />		<java-symbol type="attr" name="windowBackgroundFallback" />
	<java-symbol type="id" name="textSpacerNoButtons" />		<java-symbol type="id" name="textSpacerNoButtons" />
	<java-symbol type="array" name="dial_string_replace" />		<java-symbol type="array" name="dial_string_replace" />