From 908c7ae31752bfac989f60aa28ef15635c7aaf06 Mon Sep 17 00:00:00 2001 From: Dirk Rettschlag Date: Wed, 25 Sep 2013 15:17:52 +0200 Subject: [PATCH] Partially revert "aokp: World Phone Support" This partially revert commit 004201398671ebfdc77d10b9f06afe99f09a6fda 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 --- configs/cdma.mk | 3 +++ configs/gsm.mk | 3 +++ products/a510.mk | 3 +++ products/d2att.mk | 3 +++ products/d2tmo.mk | 3 +++ products/d2usc.mk | 3 +++ products/d2vzw.mk | 3 +++ products/evita.mk | 3 +++ products/hercules.mk | 3 +++ products/i605.mk | 3 +++ products/i9100.mk | 3 +++ products/i9100g.mk | 3 +++ products/i9300.mk | 3 +++ products/jfltespr.mk | 3 +++ products/jfltetmo.mk | 3 +++ products/jflteusc.mk | 3 +++ products/jfltevzw.mk | 3 +++ products/l900.mk | 3 +++ products/m7att.mk | 3 +++ products/m7spr.mk | 3 +++ products/m7tmo.mk | 3 +++ products/m7ul.mk | 3 +++ products/maguro.mk | 3 +++ products/mako.mk | 3 +++ products/maserati.mk | 3 +++ products/mint.mk | 3 +++ products/odin.mk | 3 +++ products/p930.mk | 3 +++ products/solana.mk | 3 +++ products/spyder.mk | 3 +++ products/su640.mk | 3 +++ products/t0lte.mk | 3 +++ products/t0lteatt.mk | 3 +++ products/t0ltetmo.mk | 3 +++ products/targa.mk | 3 +++ products/tilapia.mk | 3 +++ products/tsubasa.mk | 3 +++ products/umtsspyder.mk | 3 +++ products/vibrantmtd.mk | 3 +++ products/vs920.mk | 3 +++ products/yuga.mk | 3 +++ 41 files changed, 123 insertions(+) create mode 100644 configs/cdma.mk create mode 100644 configs/gsm.mk diff --git a/configs/cdma.mk b/configs/cdma.mk new file mode 100644 index 0000000000..fad4fa1b14 --- /dev/null +++ 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 new file mode 100644 index 0000000000..adf19df0fd --- /dev/null +++ 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 index 592f9a4619..19f34aa7d7 100644 --- 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 index f56803949b..159781a676 100644 --- 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 index cd04952255..592e4b736a 100644 --- 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 index b4a1675127..c7cd117a6d 100644 --- 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 index 097bbe8f44..99654f5983 100644 --- 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 index 1df99b12d9..afbf04e16f 100644 --- 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 index 766bb94733..c93cfd7a13 100644 --- 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 index 6db30571e3..3355813115 100755 --- 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 index 8ed6175896..a32c211fa1 100644 --- 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 index 62aeccc56f..9eff61c6db 100644 --- 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 index 2404759ade..d3df561c09 100644 --- 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 index a9a05e4a66..e9e1f985dc 100644 --- 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 index 0e8c89457d..0fd9759a8d 100644 --- 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 index 3d7bf0d6a0..031440320c 100644 --- 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 index b35fda49ae..16a7217731 100644 --- 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 index 215a5d5d42..bb733134e9 100755 --- 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 index a17da55668..bea5773e40 100644 --- 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 index 937c87011b..26848b79ce 100644 --- 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 index a6113a5df6..5d3b83fcf0 100644 --- 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 index cdf8e3f9d3..2d0b9d4220 100644 --- 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 index 1f823eecc2..5e817fd2da 100644 --- 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 index 9fd7fda8ed..f3552de91a 100644 --- 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 index c079b219d7..ce363cd196 100644 --- 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 index 83cba68245..c46529ead1 100644 --- 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 index f0443ec59b..e9943bdc04 100644 --- 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 index 4661aae4e1..d93faab170 100644 --- 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 index 232dec71ba..0fe7401214 100644 --- 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 index 7bb59a1e90..445e049431 100644 --- 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 index bcf93f7c74..ba9f66bd8f 100644 --- 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 index f7865b8a2f..0c0b931b2e 100644 --- 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 index d24a048819..67289ad0e3 100644 --- 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 index b6d208d51d..c1d4bbdc6f 100644 --- 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 index 0f8307f1de..aad10bab6e 100644 --- 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 index a93aa535b3..bca3fa70c2 100644 --- 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 index cf2cae87bf..97d4e2efff 100644 --- 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 index 2fbcaa9bed..eadd58fc49 100644 --- 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 index 52423d7527..db0e43446d 100644 --- 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 index 85ab36e7bc..caf4f1caa7 100644 --- 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 index 3ec461b6a1..aeffcc520e 100644 --- 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