surnia: Keeping it up-to-date

Commits added:

* surnia: rebrand to LineageOS (original commit https://github.com/LineageOS/android_device_motorola_surnia/commit/15651b23bca941ef65d100ad7d190d613ba3d775)
* surnia: Drop no more needed CDMA things (original commit https://github.com/LineageOS/android_device_motorola_surnia/commit/d55c94f643218bda36a0d1d584dd1a3239ac3ebc)

(the rebrand one is changing the CM thing into AICP, not LineageOS)

Change-Id: Ifb3e19028859f4c44af4b641663715f491a24591

3 files changed, 2 insertions, 48 deletions

diff --git a/init/init_surnia.cpp b/init/init_surnia.cpp
index 5fc4f5b..b13203a 100644
--- a/init/init_surnia.cpp
+++ b/init/init_surnia.cpp
@@ -63,7 +63,6 @@ void vendor_load_properties()
         property_set("ro.build.description", "surnia_verizon-user 5.1 LPI23.29-17.5 5 release-keys");
         property_set("ro.build.fingerprint", "motorola/surnia_verizon/surnia_cdma:5.1/LPI23.29-17.5/5:user/release-keys");
         property_set("ro.mot.build.customerid", "verizon");
-        property_set("ro.ril.force_eri_from_xml", "true");
         property_set("ro.telephony.get_imsi_from_sim", "true");
         property_set("ro.com.google.clientidbase.am", "android-verizon");
         property_set("ro.com.google.clientidbase.ms", "android-verizon");
@@ -111,7 +110,6 @@ void vendor_load_properties()
         property_set("persist.radio.multisim.config", "");
         property_set("ro.cdma.international.eri", "2,74,124,125,126,157,158,159,193,194,195,196,197,198,228,229,230,231,232,233,234,235");
         property_set("ro.com.android.dataroaming","false");
-	property_set("ro.ril.force_eri_from_xml", "true");
     } else if (radio == "0x4") {
         /* XT1524 */
         gsm_properties(false);
@@ -177,4 +175,4 @@ void gsm_properties(bool msim)
     } else {
         property_set("persist.radio.multisim.config", "");
     }
-}
+}
\ No newline at end of file
diff --git a/overlay/frameworks/base/core/res/res/xml-mcc311-mnc480/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc311-mnc480/eri.xml
deleted file mode 100644
index 1178262..0000000
--- a/overlay/frameworks/base/core/res/res/xml-mcc311-mnc480/eri.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-
-/* Copyright (C) 2016 The CyanogenMod Project
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<!--
- Note that IconMode can be only 0, ON or 1, FLASHING
-     The icon is turned OFF if then IconIndex = 1
--->
-<EriFile VersionNumber="5" NumberOfEriEntries="19" EriFileType="2">
-<CallPromptId Id="0" CallPromptText="CallPromptId0"/>
-<CallPromptId Id="1" CallPromptText="CallPromptId1"/>
-<CallPromptId Id="2" CallPromptText="CallPromptId2"/>
-<EriInfo RoamingIndicator="0" IconIndex="0" IconMode="0" EriText="" CallPromptId="0" AlertId="0" DataServiceSupport="1"/>
-<EriInfo RoamingIndicator="1" IconIndex="1" IconMode="0" EriText="" CallPromptId="0" AlertId="0" DataServiceSupport="1"/>
-<EriInfo RoamingIndicator="2" IconIndex="2" IconMode="1" EriText="" CallPromptId="0" AlertId="0" DataServiceSupport="1"/>
-<EriInfo RoamingIndicator="64" IconIndex="1" IconMode="0" EriText="Verizon Wireless" CallPromptId="0" AlertId="0" DataServiceSupport="1"/>
-<EriInfo RoamingIndicator="65" IconIndex="3" IconMode="0" EriText="Network Extender" CallPromptId="0" AlertId="0" DataServiceSupport="1"/>
-<EriInfo RoamingIndicator="66" IconIndex="1" IconMode="0" EriText="Extended Network" CallPromptId="0" AlertId="4" DataServiceSupport="0"/>
-<EriInfo RoamingIndicator="67" IconIndex="0" IconMode="0" EriText="Extended Network" CallPromptId="0" AlertId="4" DataServiceSupport="0"/>
-<EriInfo RoamingIndicator="68" IconIndex="0" IconMode="0" EriText="Roaming" CallPromptId="0" AlertId="5" DataServiceSupport="0"/>
-<EriInfo RoamingIndicator="69" IconIndex="2" IconMode="0" EriText="Extended Network" CallPromptId="0" AlertId="4" DataServiceSupport="0"/>
-<EriInfo RoamingIndicator="70" IconIndex="2" IconMode="0" EriText="Roaming" CallPromptId="0" AlertId="5" DataServiceSupport="0"/>
-<EriInfo RoamingIndicator="71" IconIndex="1" IconMode="0" EriText="Extended Network" CallPromptId="0" AlertId="4" DataServiceSupport="1"/>
-<EriInfo RoamingIndicator="72" IconIndex="0" IconMode="0" EriText="Extended Network" CallPromptId="0" AlertId="4" DataServiceSupport="1"/>
-<EriInfo RoamingIndicator="73" IconIndex="0" IconMode="0" EriText="Roaming" CallPromptId="0" AlertId="5" DataServiceSupport="1"/>
-<EriInfo RoamingIndicator="74" IconIndex="2" IconMode="0" EriText="Extended Network" CallPromptId="0" AlertId="4" DataServiceSupport="1"/>
-<EriInfo RoamingIndicator="75" IconIndex="2" IconMode="0" EriText="Roaming" CallPromptId="0" AlertId="5" DataServiceSupport="1"/>
-<EriInfo RoamingIndicator="76" IconIndex="0" IconMode="0" EriText="Verizon Wireless" CallPromptId="0" AlertId="0" DataServiceSupport="1"/>
-<EriInfo RoamingIndicator="77" IconIndex="2" IconMode="0" EriText="Verizon Wireless" CallPromptId="0" AlertId="0" DataServiceSupport="1"/>
-<EriInfo RoamingIndicator="78" IconIndex="1" IconMode="0" EriText="Network Extender" CallPromptId="0" AlertId="1" DataServiceSupport="1"/>
-<EriInfo RoamingIndicator="79" IconIndex="3" IconMode="1" EriText="Network Extender" CallPromptId="0" AlertId="1" DataServiceSupport="1"/>
-</EriFile>
diff --git a/releasetools.py b/releasetools.py
index b2549e6..40bab59 100644
--- a/releasetools.py
+++ b/releasetools.py
@@ -38,7 +38,7 @@ def AddAssertion(info):
   info.script.AppendExtra('ui_print("fastboot oem config fsg-id ringplus if you are a RingPlus user");')
   info.script.AppendExtra('ui_print("fastboot oem config fsg-id sprint   if you are a Sprint user or not listed");')
   info.script.AppendExtra('ui_print("fastboot oem config fsg-id virgin   if you are a Virgin Mobile user");')
-  info.script.AppendExtra('ui_print("and then flash CyanogenMod again");')
+  info.script.AppendExtra('ui_print("and then flash AICP again");')
   info.script.AppendExtra('abort("**********");')
   info.script.AppendExtra('endif;')