From 53df1df11e0718ea12d7e9b52ea6b7bab876b3f2 Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date: Tue, 29 Oct 2013 17:48:25 +0000
Subject: [PATCH] Don't assume phones are the only clients for the telephony
 configuration bits

Data-enabled tablets need love, too

Change-Id: I239823f198260d0f045c6e7305cf04082a8ef1e9
---
 config/common_full_phone.mk | 13 +------------
 config/telephony.mk         | 12 ++++++++++++
 2 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 config/telephony.mk

diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index b6fe356b..2324a11d 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -15,15 +15,4 @@ ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
         vendor/cm/prebuilt/common/bootanimation/480.zip:system/media/bootanimation.zip
 endif
 
-# World APN list
-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
-
-# SIM Toolkit
-PRODUCT_PACKAGES += \
-    Stk
-
+$(call inherit-product, vendor/cm/config/telephony.mk)
diff --git a/config/telephony.mk b/config/telephony.mk
new file mode 100644
index 00000000..3beaf0df
--- /dev/null
+++ b/config/telephony.mk
@@ -0,0 +1,12 @@
+# World APN list
+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
+
+# SIM Toolkit
+PRODUCT_PACKAGES += \
+    Stk
+