resolve merge conflicts of 7d9c798 to master
Change-Id: I83b6547836ab89ae3fdec7c28fa61063a2ed2c1c
diff --git a/README b/README
new file mode 100644
index 0000000..c6432f0
--- /dev/null
+++ b/README
@@ -0,0 +1,12 @@
+Default Carrier Config App
+==========================
+
+This app works as part of com.android.phone.CarrierConfigLoader to configure telephony features
+based on the subscriber's network. It replaced many XML resource overlays in frameworks/base and
+frameworks/opt/telephony. The current framework allows per-network configuration that uses
+CarrierIdentifier objects, rather than just mcc/mnc.
+
+This app uses a CarrierIdentifier to read the appropriate config snippets from the assets folder.
+
+If you make changes to the XML files, run the unit tests to ensure they can still be parsed:
+ runtest carrierconfig-unit
\ No newline at end of file
diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index 2d8bbbf..3ad4bee 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -10,5 +10,21 @@
<boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
<string name="carrier_eri_file_name_string">eri_311480.xml</string>
<int name="carrier_default_wfc_ims_mode_int" value="1"/>
+ <string-array name="carrier_data_call_permanent_failure_strings" num="14">
+ <item value="OPERATOR_BARRED" />
+ <item value="MISSING_UNKNOWN_APN" />
+ <item value="UNKNOWN_PDP_ADDRESS_TYPE" />
+ <item value="USER_AUTHENTICATION" />
+ <item value="SERVICE_OPTION_NOT_SUPPORTED" />
+ <item value="SERVICE_OPTION_NOT_SUBSCRIBED" />
+ <item value="NSAPI_IN_USE" />
+ <item value="ONLY_IPV4_ALLOWED" />
+ <item value="ONLY_IPV6_ALLOWED" />
+ <item value="RADIO_POWER_OFF" />
+ <item value="TETHERED_CALL_ACTIVE" />
+ <item value="RADIO_NOT_AVAILABLE" />
+ <item value="UNACCEPTABLE_NETWORK_PARAMETER" />
+ <item value="SIGNAL_LOST" />
+ </string-array>
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml
index abbc869..0e16154 100644
--- a/assets/carrier_config_310004.xml
+++ b/assets/carrier_config_310004.xml
@@ -28,5 +28,21 @@
<boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
<string name="carrier_eri_file_name_string">eri_311480.xml</string>
<int name="carrier_default_wfc_ims_mode_int" value="1"/>
+ <string-array name="carrier_data_call_permanent_failure_strings" num="14">
+ <item value="OPERATOR_BARRED" />
+ <item value="MISSING_UNKNOWN_APN" />
+ <item value="UNKNOWN_PDP_ADDRESS_TYPE" />
+ <item value="USER_AUTHENTICATION" />
+ <item value="SERVICE_OPTION_NOT_SUPPORTED" />
+ <item value="SERVICE_OPTION_NOT_SUBSCRIBED" />
+ <item value="NSAPI_IN_USE" />
+ <item value="ONLY_IPV4_ALLOWED" />
+ <item value="ONLY_IPV6_ALLOWED" />
+ <item value="RADIO_POWER_OFF" />
+ <item value="TETHERED_CALL_ACTIVE" />
+ <item value="RADIO_NOT_AVAILABLE" />
+ <item value="UNACCEPTABLE_NETWORK_PARAMETER" />
+ <item value="SIGNAL_LOST" />
+ </string-array>
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index b2cdf3f..1f8bb5b 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -4,6 +4,8 @@
<boolean name="carrier_vt_available_bool" value="true" />
<boolean name="carrier_allow_turnoff_ims_bool" value="false" />
<boolean name="carrier_volte_provisioning_required_bool" value="true" />
+ <boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true" />
+ <boolean name="drop_video_call_when_answering_audio_call_bool" value="true" />
<boolean name="operator_selection_expand_bool" value="true" />
<int name="aliasMinChars" value="2" />
<boolean name="dtmf_type_enabled_bool" value="true" />
@@ -33,7 +35,25 @@
<boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
<string name="carrier_eri_file_name_string">eri_311480.xml</string>
<int name="carrier_default_wfc_ims_mode_int" value="1"/>
- <boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true" />
- <boolean name="drop_video_call_when_answering_audio_call_bool" value="true" />
+ <string-array name="carrier_data_call_permanent_failure_strings" num="14">
+ <item value="OPERATOR_BARRED" />
+ <item value="MISSING_UNKNOWN_APN" />
+ <item value="UNKNOWN_PDP_ADDRESS_TYPE" />
+ <item value="USER_AUTHENTICATION" />
+ <item value="SERVICE_OPTION_NOT_SUPPORTED" />
+ <item value="SERVICE_OPTION_NOT_SUBSCRIBED" />
+ <item value="NSAPI_IN_USE" />
+ <item value="ONLY_IPV4_ALLOWED" />
+ <item value="ONLY_IPV6_ALLOWED" />
+ <item value="RADIO_POWER_OFF" />
+ <item value="TETHERED_CALL_ACTIVE" />
+ <item value="RADIO_NOT_AVAILABLE" />
+ <item value="UNACCEPTABLE_NETWORK_PARAMETER" />
+ <item value="SIGNAL_LOST" />
+ </string-array>
+ </carrier_config>
+ <!-- Tracfone Vzw shows empty string as SPN -->
+ <carrier_config gid1="BA01270000000000">
+ <boolean name="carrier_name_override_bool" value="true" />
</carrier_config>
</carrier_config_list>