commit 822414ece165f43c59bd1d9a4ea2141899f329df
author Nathan Harold <nharold@google.com> Tue Oct 24 14:45:38 2017 -0700
committer nharold <nharold@google.com> Wed Nov 29 02:53:47 2017 +0000
tree b2793d3c97880a11c422075810e81516d57c86c2
parent 2d26510828c19bef7194641ca4ac6131b6027fc8

Remove spn-conf.xml

Bug: 68049890
Test: builds+boots

Change-Id: Iacc74c7dd5ec3d21179a8064c888e4fdaa894a04

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 2b196f2..5e236c3 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -238,10 +238,6 @@
     frameworks/native/data/etc/android.hardware.vr.high_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vr.high_performance.xml \
     frameworks/native/data/etc/android.hardware.vr.headtracking-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vr.headtracking.xml \
 
-# For SPN display
-PRODUCT_COPY_FILES += \
-    device/google/marlin/spn-conf.xml:system/etc/spn-conf.xml
-
 # new gatekeeper HAL
 PRODUCT_PACKAGES += \
     android.hardware.gatekeeper@1.0-impl \

spn-conf.xml

diff --git a/spn-conf.xml b/spn-conf.xml
deleted file mode 100644
index 56f2228..0000000
--- a/spn-conf.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<spnOverrides>
-    <spnOverride numeric="23430" spn="EE"/>
-    <spnOverride numeric="23433" spn="EE"/>
-    <spnOverride numeric="26201" spn="Telekom"/>
-    <spnOverride numeric="310004" spn="Verizon"/>
-    <spnOverride numeric="302370" spn="Fido"/>
-    <spnOverride numeric="302720" spn="Rogers"/>
-    <spnOverride numeric="310120" spn="Sprint"/>
-    <spnOverride numeric="310150" spn="AT&amp;T"/>
-    <spnOverride numeric="310160" spn="T-Mobile"/>
-    <spnOverride numeric="310200" spn="T-Mobile"/>
-    <spnOverride numeric="310210" spn="T-Mobile"/>
-    <spnOverride numeric="310220" spn="T-Mobile"/>
-    <spnOverride numeric="310230" spn="T-Mobile"/>
-    <spnOverride numeric="310240" spn="T-Mobile"/>
-    <spnOverride numeric="310250" spn="T-Mobile"/>
-    <spnOverride numeric="310260" spn="T-Mobile"/>
-    <spnOverride numeric="310270" spn="T-Mobile"/>
-    <spnOverride numeric="310300" spn="T-Mobile"/>
-    <spnOverride numeric="310310" spn="T-Mobile"/>
-    <spnOverride numeric="310490" spn="T-Mobile USA"/>
-    <spnOverride numeric="310530" spn="T-Mobile"/>
-    <spnOverride numeric="310560" spn="AT&amp;T"/>
-    <spnOverride numeric="310580" spn="T-Mobile"/>
-    <spnOverride numeric="310590" spn="T-Mobile"/>
-    <spnOverride numeric="310640" spn="T-Mobile"/>
-    <spnOverride numeric="310660" spn="T-Mobile"/>
-    <spnOverride numeric="310680" spn="AT&amp;T"/>
-    <spnOverride numeric="310800" spn="T-Mobile"/>
-    <spnOverride numeric="310980" spn="AT&amp;T"/>
-    <spnOverride numeric="311180" spn="AT&amp;T"/>
-    <spnOverride numeric="311480" spn="Verizon"/>
-    <spnOverride numeric="40402" spn="airtel"/>
-    <spnOverride numeric="40403" spn="airtel"/>
-    <spnOverride numeric="40410" spn="airtel"/>
-    <spnOverride numeric="40416" spn="airtel"/>
-    <spnOverride numeric="40431" spn="airtel"/>
-    <spnOverride numeric="40440" spn="airtel"/>
-    <spnOverride numeric="40445" spn="airtel"/>
-    <spnOverride numeric="40449" spn="airtel"/>
-    <spnOverride numeric="40490" spn="airtel"/>
-    <spnOverride numeric="40492" spn="airtel"/>
-    <spnOverride numeric="40493" spn="airtel"/>
-    <spnOverride numeric="40494" spn="airtel"/>
-    <spnOverride numeric="40495" spn="airtel"/>
-    <spnOverride numeric="40496" spn="airtel"/>
-    <spnOverride numeric="40497" spn="airtel"/>
-    <spnOverride numeric="40498" spn="airtel"/>
-    <spnOverride numeric="40551" spn="airtel"/>
-    <spnOverride numeric="40552" spn="airtel"/>
-    <spnOverride numeric="40553" spn="airtel"/>
-    <spnOverride numeric="40554" spn="airtel"/>
-    <spnOverride numeric="40555" spn="airtel"/>
-    <spnOverride numeric="40556" spn="airtel"/>
-    <spnOverride numeric="405840" spn="JIO"/>
-    <spnOverride numeric="405854" spn="JIO"/>
-    <spnOverride numeric="405855" spn="JIO"/>
-    <spnOverride numeric="405856" spn="JIO"/>
-    <spnOverride numeric="405857" spn="JIO"/>
-    <spnOverride numeric="405858" spn="JIO"/>
-    <spnOverride numeric="405859" spn="JIO"/>
-    <spnOverride numeric="405860" spn="JIO"/>
-    <spnOverride numeric="405861" spn="JIO"/>
-    <spnOverride numeric="405862" spn="JIO"/>
-    <spnOverride numeric="405863" spn="JIO"/>
-    <spnOverride numeric="405864" spn="JIO"/>
-    <spnOverride numeric="405865" spn="JIO"/>
-    <spnOverride numeric="405866" spn="JIO"/>
-    <spnOverride numeric="405867" spn="JIO"/>
-    <spnOverride numeric="405868" spn="JIO"/>
-    <spnOverride numeric="405869" spn="JIO"/>
-    <spnOverride numeric="405870" spn="JIO"/>
-    <spnOverride numeric="405871" spn="JIO"/>
-    <spnOverride numeric="405872" spn="JIO"/>
-    <spnOverride numeric="405873" spn="JIO"/>
-    <spnOverride numeric="405874" spn="JIO"/>
-    <spnOverride numeric="42507" spn="HOT mobile"/>
-    <spnOverride numeric="42508" spn="Golan Telecom"/>
-    <spnOverride numeric="42510" spn="Orange-IL"/>
-    <spnOverride numeric="42514" spn="YouPhone"/>
-    <spnOverride numeric="42515" spn="Home Cellular"/>
-    <spnOverride numeric="42516" spn="Rami Levy"/>
-</spnOverrides>