per carier id based country code override

mcc based sim country code is coarse and inaccurate. Apply per carrier
based country code override espeically for those with dual imsi.

Bug: 64775297
Bug: 110559381
Test: Build
Change-Id: Ic0a6855897b2d68eeaee46f56e3c226559c39200

19 files changed, 40 insertions, 0 deletions

diff --git a/assets/carrier_config_carrierid_1836_C-Spire.xml b/assets/carrier_config_carrierid_1836_C-Spire.xml
index d0683dd..b424249 100644
--- a/assets/carrier_config_carrierid_1836_C-Spire.xml
+++ b/assets/carrier_config_carrierid_1836_C-Spire.xml
@@ -14,4 +14,5 @@
     <int name="maxImageWidth" value="4320"/>
     <string name="httpParams" value="X-CS3G-MDN: 1##LINE1NOCOUNTRYCODE##"/>
     <string name="emailGatewayNumber" value="6245"/>
+    <string name="sim_country_iso_override_string" value="us"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml b/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml
index 2a632ac..a3e98d2 100644
--- a/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml
+++ b/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml
@@ -150,4 +150,5 @@
     <int name="wfc_spn_format_idx_int" value="1"/>
     <boolean name="wifi_calls_can_be_hd_audio" value="false"/>
     <boolean name="world_mode_enabled_bool" value="true"/>
+    <string name="sim_country_iso_override_string" value="us"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1895_Freedom-Mobile.xml b/assets/carrier_config_carrierid_1895_Freedom-Mobile.xml
index a63cd28..9cac9c9 100644
--- a/assets/carrier_config_carrierid_1895_Freedom-Mobile.xml
+++ b/assets/carrier_config_carrierid_1895_Freedom-Mobile.xml
@@ -6,4 +6,5 @@
     <int name="maxSubjectLength" value="80"/>
     <int name="maxMessageSize" value="1048576"/>
     <int name="maxImageWidth" value="2592"/>
+    <string name="sim_country_iso_override_string" value="ca"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1909_Euskaltel.xml b/assets/carrier_config_carrierid_1909_Euskaltel.xml
index 8ba8e6e..22fe42d 100644
--- a/assets/carrier_config_carrierid_1909_Euskaltel.xml
+++ b/assets/carrier_config_carrierid_1909_Euskaltel.xml
@@ -22,4 +22,5 @@
         <item value="214021"/>
     </string-array>
     <boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
+    <string name="sim_country_iso_override_string" value="es"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1912_AT&T-MX.xml b/assets/carrier_config_carrierid_1912_AT&T-MX.xml
index 83f12e1..b7b2e28 100644
--- a/assets/carrier_config_carrierid_1912_AT&T-MX.xml
+++ b/assets/carrier_config_carrierid_1912_AT&T-MX.xml
@@ -2,4 +2,5 @@
 <carrier_config>
     <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
     <boolean name="skip_cf_fail_to_disable_dialog_bool" value="true"/>
+    <string name="sim_country_iso_override_string" value="mx"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1952_US-Cellular.xml b/assets/carrier_config_carrierid_1952_US-Cellular.xml
index f49ebb9..2f0e8c4 100644
--- a/assets/carrier_config_carrierid_1952_US-Cellular.xml
+++ b/assets/carrier_config_carrierid_1952_US-Cellular.xml
@@ -20,4 +20,5 @@
     <boolean name="support_swap_after_merge_bool" value="false"/>
     <string name="uaProfTagName" value="x-wap-profile"/>
     <boolean name="use_otasp_for_provisioning_bool" value="true"/>
+    <string name="sim_country_iso_override_string" value="us"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1989_Google-Fi.xml b/assets/carrier_config_carrierid_1989_Google-Fi.xml
index 2714cb8..bf74d4c 100644
--- a/assets/carrier_config_carrierid_1989_Google-Fi.xml
+++ b/assets/carrier_config_carrierid_1989_Google-Fi.xml
@@ -2,4 +2,5 @@
 <carrier_config>
     <boolean name="carrier_name_override_bool" value="true"/>
     <string name="carrier_name_string" value="Google Fi"/>
+    <string name="sim_country_iso_override_string" value="us"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_1991_Hot-Mobile.xml b/assets/carrier_config_carrierid_1991_Hot-Mobile.xml
index 2c8e7bc..0d2fb77 100644
--- a/assets/carrier_config_carrierid_1991_Hot-Mobile.xml
+++ b/assets/carrier_config_carrierid_1991_Hot-Mobile.xml
@@ -5,4 +5,5 @@
     <string-array name="non_roaming_operator_string_array" num="1">
         <item value="42503"/>
     </string-array>
+    <string name="sim_country_iso_override_string" value="il"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2106_IIJmio.xml b/assets/carrier_config_carrierid_2106_IIJmio.xml
new file mode 100644
index 0000000..bf4f219
--- /dev/null
+++ b/assets/carrier_config_carrierid_2106_IIJmio.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<carrier_config>
+    <string name="sim_country_iso_override_string" value="jp"/>
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_2124_Iliad.xml b/assets/carrier_config_carrierid_2124_Iliad.xml
new file mode 100644
index 0000000..6140262
--- /dev/null
+++ b/assets/carrier_config_carrierid_2124_Iliad.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<carrier_config>
+    <string name="sim_country_iso_override_string" value="it"/>
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_2127_free_re.xml b/assets/carrier_config_carrierid_2127_free_re.xml
new file mode 100644
index 0000000..e378cfb
--- /dev/null
+++ b/assets/carrier_config_carrierid_2127_free_re.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<carrier_config>
+    <string name="sim_country_iso_override_string" value="re"/>
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_2130_ALIV_BS.xml b/assets/carrier_config_carrierid_2130_ALIV_BS.xml
new file mode 100644
index 0000000..5a2721e
--- /dev/null
+++ b/assets/carrier_config_carrierid_2130_ALIV_BS.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<carrier_config>
+    <string name="sim_country_iso_override_string" value="bs"/>
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_2135_Coriolis.xml b/assets/carrier_config_carrierid_2135_Coriolis.xml
index 212dfab..a608ba0 100644
--- a/assets/carrier_config_carrierid_2135_Coriolis.xml
+++ b/assets/carrier_config_carrierid_2135_Coriolis.xml
@@ -11,4 +11,5 @@
         <item value="20801"/>
         <item value="20810"/>
     </string-array>
+    <string name="sim_country_iso_override_string" value="fr"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_2137_Gamma.xml b/assets/carrier_config_carrierid_2137_Gamma.xml
new file mode 100644
index 0000000..8536761
--- /dev/null
+++ b/assets/carrier_config_carrierid_2137_Gamma.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<carrier_config>
+    <string name="sim_country_iso_override_string" value="gb"/>
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_2138_jump.xml b/assets/carrier_config_carrierid_2138_jump.xml
new file mode 100644
index 0000000..8536761
--- /dev/null
+++ b/assets/carrier_config_carrierid_2138_jump.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<carrier_config>
+    <string name="sim_country_iso_override_string" value="gb"/>
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_2139_sky.xml b/assets/carrier_config_carrierid_2139_sky.xml
new file mode 100644
index 0000000..8536761
--- /dev/null
+++ b/assets/carrier_config_carrierid_2139_sky.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<carrier_config>
+    <string name="sim_country_iso_override_string" value="gb"/>
+</carrier_config>
diff --git a/assets/carrier_config_carrierid_2237_China-Telecom.xml b/assets/carrier_config_carrierid_2237_China-Telecom.xml
index 3387231..d7a1c2d 100644
--- a/assets/carrier_config_carrierid_2237_China-Telecom.xml
+++ b/assets/carrier_config_carrierid_2237_China-Telecom.xml
@@ -2,4 +2,5 @@
 <carrier_config>
     <boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
     <boolean name="show_apn_setting_cdma_bool" value="true"/>
+    <string name="sim_country_iso_override_string" value="cn"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_580_Sask-Tel-Mobility.xml b/assets/carrier_config_carrierid_580_Sask-Tel-Mobility.xml
index b77c9de..272936d 100644
--- a/assets/carrier_config_carrierid_580_Sask-Tel-Mobility.xml
+++ b/assets/carrier_config_carrierid_580_Sask-Tel-Mobility.xml
@@ -6,4 +6,5 @@
     <string-array name="non_roaming_operator_string_array" num="1">
         <item value="302"/>
     </string-array>
+    <string name="sim_country_iso_override_string" value="ca"/>
 </carrier_config>
diff --git a/assets/carrier_config_carrierid_717_Virgin.xml b/assets/carrier_config_carrierid_717_Virgin.xml
index fe091f7..419ab81 100644
--- a/assets/carrier_config_carrierid_717_Virgin.xml
+++ b/assets/carrier_config_carrierid_717_Virgin.xml
@@ -17,4 +17,5 @@
         <item value="REG09|0"/>
     </string-array>
     <int name="wfc_spn_format_idx_int" value="1"/>
+    <string name="sim_country_iso_override_string" value="gb"/>
 </carrier_config>