Partially revert "aokp: World Phone Support"

This partially revert commit 0042013 We need to keep the gsm.mk & cdma.mk to specify the telefon type. This fixes the 2G toggle not being visible after boot. Change-Id: I9ba358a580043c587c16f10c83517f56d9693c13 Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
tristan202 · Sep 25, 2013 · 908c7ae · 908c7ae
1 parent 0493cde
commit 908c7ae
Show file tree

Hide file tree

Showing 41 changed files with 123 additions and 0 deletions.
diff --git a/configs/cdma.mk b/configs/cdma.mk
@@ -0,0 +1,3 @@
+# specify phone type - needed by 2G toggle
+PRODUCT_PROPERTY_OVERRIDES += \
+    gsm.current.phone-type=2
diff --git a/configs/gsm.mk b/configs/gsm.mk
@@ -0,0 +1,3 @@
+# specify phone type - needed by 2G toggle
+PRODUCT_PROPERTY_OVERRIDES += \
+    gsm.current.phone-type=1
diff --git a/products/a510.mk b/products/a510.mk
@@ -1,3 +1,6 @@
+## Specify phone tech before including full_phone
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Release name
 PRODUCT_RELEASE_NAME := A510
 

diff --git a/products/d2att.mk b/products/d2att.mk
@@ -1,6 +1,9 @@
 # Inherit AOSP device configuration for d2att.
 $(call inherit-product, device/samsung/d2att/full_d2att.mk)
 
+# Inherit GSM common stuff.
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/d2tmo.mk b/products/d2tmo.mk
@@ -1,6 +1,9 @@
 # Inherit AOSP device configuration for d2tmo.
 $(call inherit-product, device/samsung/d2tmo/full_d2tmo.mk)
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/d2usc.mk b/products/d2usc.mk
@@ -1,6 +1,9 @@
 # Inherit AOSP device configuration for pyramid.
 $(call inherit-product, device/samsung/d2usc/full_d2usc.mk)
 
+# Inherit common cdma apns
+$(call inherit-product, vendor/aokp/configs/cdma.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/d2vzw.mk b/products/d2vzw.mk
@@ -1,6 +1,9 @@
 # Inherit AOSP device configuration for d2vzw.
 $(call inherit-product, device/samsung/d2vzw/full_d2vzw.mk)
 
+# Inherit common cdma apns
+$(call inherit-product, vendor/aokp/configs/cdma.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/evita.mk b/products/evita.mk
@@ -1,3 +1,6 @@
+# Specify phone tech before including full_phone
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Release name
 PRODUCT_RELEASE_NAME := evita
 

diff --git a/products/hercules.mk b/products/hercules.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/samsung/hercules/full_hercules.mk)
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # skyrocket overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/hercules
 

diff --git a/products/i605.mk b/products/i605.mk
@@ -1,6 +1,9 @@
 # Inherit AOSP device configuration for i605.
 $(call inherit-product, device/samsung/i605/full_i605.mk)
 
+# Inherit common cdma apns
+$(call inherit-product, vendor/aokp/configs/cdma.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/i9100.mk b/products/i9100.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/samsung/i9100/full_i9100.mk)
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # SGS2 overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/i9100
 

diff --git a/products/i9100g.mk b/products/i9100g.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/samsung/i9100g/full_i9100g.mk)
 # Inherit AOKP common bits
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # i9100g overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/i9100
 

diff --git a/products/i9300.mk b/products/i9300.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/samsung/i9300/full_i9300.mk)
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Setup device specific product configuration.
 PRODUCT_NAME := aokp_i9300
 PRODUCT_BRAND := samsung

diff --git a/products/jfltespr.mk b/products/jfltespr.mk
@@ -1,6 +1,9 @@
 # Inherit AOSP device configuration for jfltespr
 $(call inherit-product, device/samsung/jfltespr/full_jfltespr.mk)
 
+# Inherit common cdma apns
+$(call inherit-product, vendor/aokp/configs/cdma.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/jfltetmo.mk b/products/jfltetmo.mk
@@ -1,5 +1,8 @@
 $(call inherit-product, device/samsung/jfltetmo/full_jfltetmo.mk)
 
+# Inherit some common stuff.
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Inherit some common stuff.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 $(call inherit-product, vendor/aokp/configs/common_versions.mk)

diff --git a/products/jflteusc.mk b/products/jflteusc.mk
@@ -1,6 +1,9 @@
 # Inherit AOSP device configuration for jflteusc
 $(call inherit-product, device/samsung/jflteusc/full_jflteusc.mk)
 
+# Inherit common cdma apns
+$(call inherit-product, vendor/aokp/configs/cdma.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/jfltevzw.mk b/products/jfltevzw.mk
@@ -1,6 +1,9 @@
 # Inherit AOSP device configuration for jfltevzw
 $(call inherit-product, device/samsung/jfltevzw/full_jfltevzw.mk)
 
+# Inherit common cdma apns
+$(call inherit-product, vendor/aokp/configs/cdma.mk)
+
 # Inherit common Verizon Wireless Perms and Lib
 $(call inherit-product, vendor/aokp/configs/vzw.mk)
 

diff --git a/products/l900.mk b/products/l900.mk
@@ -1,6 +1,9 @@
 # Inherit AOSP device configuration for l900.
 $(call inherit-product, device/samsung/l900/full_l900.mk)
 
+# Inherit common cdma apns
+$(call inherit-product, vendor/aokp/configs/cdma.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/m7att.mk b/products/m7att.mk
@@ -1,3 +1,6 @@
+# Specify phone tech before including full_phone
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
 # Inherit device configuration

diff --git a/products/m7spr.mk b/products/m7spr.mk
@@ -1,3 +1,6 @@
+# Specify phone tech before including full_phone
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
 # Inherit device configuration

diff --git a/products/m7tmo.mk b/products/m7tmo.mk
@@ -1,3 +1,6 @@
+# Specify phone tech before including full_phone
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
 # Inherit device configuration

diff --git a/products/m7ul.mk b/products/m7ul.mk
@@ -1,3 +1,6 @@
+# Specify phone tech before including full_phone
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
 # Inherit device configuration

diff --git a/products/maguro.mk b/products/maguro.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/samsung/maguro/full_maguro.mk)
 # Inherit AOKP common bits
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Tuna Overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/tuna
 

diff --git a/products/mako.mk b/products/mako.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/lge/mako/full_mako.mk)
 # Inherit AOKP common bits
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Mako Overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/mako
 

diff --git a/products/maserati.mk b/products/maserati.mk
@@ -1,6 +1,9 @@
 # Inherit device configuration for VZW Droid 4.
 $(call inherit-product, device/motorola/maserati/full_maserati.mk)
 
+# Inherit common cdma apns
+$(call inherit-product, vendor/aokp/configs/cdma.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/mint.mk b/products/mint.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/sony/mint/full_mint.mk)
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # mint overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/mint
 

diff --git a/products/odin.mk b/products/odin.mk
@@ -4,6 +4,9 @@ $(call inherit-product-if-exists, device/sony/odin/full_odin.mk)
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # hayabusa overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/odin
 

diff --git a/products/p930.mk b/products/p930.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/lge/p930/full_p930.mk)
 # Release name
 PRODUCT_RELEASE_NAME := NitroHD
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/solana.mk b/products/solana.mk
@@ -1,6 +1,9 @@
 # Inherit device configuration for Droid3.
 $(call inherit-product, device/motorola/solana/full_solana.mk)
 
+# Inherit common cdma apns
+$(call inherit-product, vendor/aokp/configs/cdma.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/spyder.mk b/products/spyder.mk
@@ -1,6 +1,9 @@
 # Inherit device configuration for VZW Droid RAZR.
 $(call inherit-product, device/motorola/spyder/full_spyder.mk)
 
+# Inherit common cdma apns
+$(call inherit-product, vendor/aokp/configs/cdma.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/su640.mk b/products/su640.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/lge/su640/full_su640.mk)
 # Release name
 PRODUCT_RELEASE_NAME := OptimusLTE
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/t0lte.mk b/products/t0lte.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/samsung/t0lte/full_t0lte.mk)
 # Release name
 PRODUCT_RELEASE_NAME := t0lte
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/t0lteatt.mk b/products/t0lteatt.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/samsung/t0lteatt/full_t0lteatt.mk)
 # Release name
 PRODUCT_RELEASE_NAME := t0lteatt
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/t0ltetmo.mk b/products/t0ltetmo.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/samsung/t0ltetmo/full_t0ltetmo.mk)
 # Release name
 PRODUCT_RELEASE_NAME := t0ltetmo
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/targa.mk b/products/targa.mk
@@ -1,6 +1,9 @@
 # Inherit device configuration for Droid Bionic.
 $(call inherit-product, device/motorola/targa/full_targa.mk)
 
+# Inherit common cdma apns
+$(call inherit-product, vendor/aokp/configs/cdma.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/tilapia.mk b/products/tilapia.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/asus/tilapia/full_tilapia.mk)
 # Inherit AOKP common_tablet bits
 $(call inherit-product, vendor/aokp/configs/common_tablet.mk)
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Grouper Overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/grouper
 

diff --git a/products/tsubasa.mk b/products/tsubasa.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/sony/tsubasa/full_tsubasa.mk)
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # tsubasa overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/tsubasa
 

diff --git a/products/umtsspyder.mk b/products/umtsspyder.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/motorola/umts_spyder/full_umts_spyder.mk)
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 DEVICE_PACKAGE_OVERLAYS += vendor/aokp/overlay/umts_spyder
 
 # Setup device specific product configuration.

diff --git a/products/vibrantmtd.mk b/products/vibrantmtd.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/samsung/vibrantmtd/full_vibrantmtd.mk)
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # Inherit Aries-common overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/aries-common
 

diff --git a/products/vs920.mk b/products/vs920.mk
@@ -4,6 +4,9 @@ $(call inherit-product, device/lge/vs920/full_vs920.mk)
 # Release name
 PRODUCT_RELEASE_NAME := Spectrum
 
+# Inherit CDMA common stuff
+$(call inherit-product, vendor/aokp/configs/cdma.mk)
+
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 

diff --git a/products/yuga.mk b/products/yuga.mk
@@ -4,6 +4,9 @@ $(call inherit-product-if-exists, device/sony/yuga/full_yuga.mk)
 # Inherit common product files.
 $(call inherit-product, vendor/aokp/configs/common.mk)
 
+# Inherit GSM common stuff
+$(call inherit-product, vendor/aokp/configs/gsm.mk)
+
 # hayabusa overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/yuga