Merge "test to enforce no mccmnc.xml if there is a matching carrier id"
diff --git a/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml b/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml
index 3ea5be6..2a632ac 100644
--- a/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml
+++ b/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml
@@ -135,6 +135,7 @@
<int name="recipientLimit" value="20"/>
<boolean name="rtt_supported_bool" value="true"/>
<boolean name="show_apn_setting_cdma_bool" value="true"/>
+ <boolean name="use_rcs_presence_bool" value="true" />
<int name="smsToMmsTextThreshold" value="7"/>
<boolean name="sms_requires_destination_number_conversion_bool" value="true"/>
<boolean name="support_3gpp_call_forwarding_while_roaming_bool" value="false"/>
diff --git a/assets/carrier_config_carrierid_1989_Project-Fi.xml b/assets/carrier_config_carrierid_1989_Google-Fi.xml
similarity index 71%
rename from assets/carrier_config_carrierid_1989_Project-Fi.xml
rename to assets/carrier_config_carrierid_1989_Google-Fi.xml
index 171924a..2714cb8 100644
--- a/assets/carrier_config_carrierid_1989_Project-Fi.xml
+++ b/assets/carrier_config_carrierid_1989_Google-Fi.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<carrier_config>
<boolean name="carrier_name_override_bool" value="true"/>
- <string name="carrier_name_string" value="Fi Network"/>
+ <string name="carrier_name_string" value="Google Fi"/>
</carrier_config>
