Don't assume phones are the only clients for the telephony configuration bits
Data-enabled tablets need love, too
Change-Id: I239823f198260d0f045c6e7305cf04082a8ef1e9
diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index b6fe356..2324a11 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -15,15 +15,4 @@
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 0000000..3beaf0d
--- /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
+