Kill spn-conf overrides
These were overloading the ASCII names to region-specific charsets,
which looks nice but it's horribly confusing if you're not native
from those regions and happen to be roaming there.
So... like our upstreams, just show the original carrier names
Change-Id: Icb3c6c9be2a4ee57866f2f57411a4f441be88f7c
diff --git a/config/telephony.mk b/config/telephony.mk
index 2a4baef..da54845 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -2,10 +2,6 @@
PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
-# World SPN overrides list
-PRODUCT_COPY_FILES += \
- vendor/cm/prebuilt/common/etc/spn-conf.xml:system/etc/spn-conf.xml
-
# Selective SPN list for operator number who has the problem.
PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/etc/selective-spn-conf.xml:system/etc/selective-spn-conf.xml
diff --git a/prebuilt/common/etc/spn-conf.xml b/prebuilt/common/etc/spn-conf.xml
deleted file mode 100644
index f7ecaa0..0000000
--- a/prebuilt/common/etc/spn-conf.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<spnOverrides>
- <!-- Korea -->
- <spnOverride numeric="45005" spn_display_rule="SPN_RULE_SHOW_PLMN" />
- <!-- Hong Kong -->
- <spnOverride numeric="45406" spn="SmarTone" />
- <spnOverride numeric="45412" spn="中國移動香港" />
- <!-- China -->
- <spnOverride numeric="46000" spn="中国移动" />
- <spnOverride numeric="46001" spn="中国联通" />
- <spnOverride numeric="46002" spn="中国移动" />
- <spnOverride numeric="46003" spn="中国电信" />
- <spnOverride numeric="46007" spn="中国移动" />
- <!-- Taiwan -->
- <spnOverride numeric="46601" spn="遠傳電信" />
- <spnOverride numeric="46688" spn="和信電訊" />
- <spnOverride numeric="46689" spn="威寶電信" />
- <spnOverride numeric="46692" spn="中華電信" />
- <spnOverride numeric="46693" spn="東信電訊" />
- <spnOverride numeric="46697" spn="台灣大哥大" />
- <spnOverride numeric="46699" spn="泛亞電信" />
-</spnOverrides>