From ac1bb3f2dac59774df08f33458bea15d1d680313 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 19 Sep 2024 22:46:24 +0800 Subject: [PATCH 1/3] gps: set default SUPL SSL method to SSLv23 Bug: 363886476 Test: verify SUPL NI test pass (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:96a0ec11ba0545a56f6496c5a93ecb570a3ca7f7) Merged-In: Iefe7acffac50ff14447b7d35c9c50e699637aba1 Change-Id: Iefe7acffac50ff14447b7d35c9c50e699637aba1 --- location/gps.6.1.xml.oriole | 2 +- location/gps.6.1.xml.raven | 2 +- location/gps.xml | 2 +- location/gps.xml.oriole | 2 +- location/gps.xml.raven | 2 +- location/gps_user.6.1.xml.oriole | 2 +- location/gps_user.6.1.xml.raven | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.oriole | 2 +- location/gps_user.xml.raven | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole index f442e3a..df40156 100644 --- a/location/gps.6.1.xml.oriole +++ b/location/gps.6.1.xml.oriole @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven index 3726311..c831068 100644 --- a/location/gps.6.1.xml.raven +++ b/location/gps.6.1.xml.raven @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml b/location/gps.xml index 76eb81e..009aaec 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index 2f191d6..4833857 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml.raven b/location/gps.xml.raven index 3ddfe1c..d663ebf 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole index ccea80d..0582009 100644 --- a/location/gps_user.6.1.xml.oriole +++ b/location/gps_user.6.1.xml.oriole @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven index 2230ace..c276c11 100644 --- a/location/gps_user.6.1.xml.raven +++ b/location/gps_user.6.1.xml.raven @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 405b8b6..008efb0 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole index f935676..ec8d881 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven index ff3c5e2..3489a66 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" From d009e5b1182af50dcf8f005e4f7036657ff9a819 Mon Sep 17 00:00:00 2001 From: kellyhung Date: Wed, 6 Nov 2024 05:55:01 +0000 Subject: [PATCH 2/3] Add PLAYVIDEOS_VERSION_DIR and PRODUCT_SOONG_NAMESPACES for Videos. Bug: 377402842 Test: m Video Flag: EXEMPT bugfix Change-Id: Ic3041f2726d8de35bc8eb8591c7535d560b80349 --- device-oriole.mk | 5 +++++ device-raven.mk | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index b38f140..5e161ac 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -364,3 +364,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) endif endif + +# PlayVideos +PLAYVIDEOS_VERSION_DIR := 4.20.6 +$(call soong_config_set_bool,playvideos,use_device_specific_version,true) +PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR) diff --git a/device-raven.mk b/device-raven.mk index 49ff1e0..54cccdc 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -373,3 +373,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) endif endif + +# PlayVideos +PLAYVIDEOS_VERSION_DIR := 4.20.6 +$(call soong_config_set_bool,playvideos,use_device_specific_version,true) +PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR) From 5003ac58530f53d00f7fa9c9666c544b9aa31222 Mon Sep 17 00:00:00 2001 From: Eileen Lai Date: Sun, 8 Dec 2024 07:40:05 +0000 Subject: [PATCH 3/3] modem_svc: use modem_svc_sit version sepolicy For solving sepolicy conflicts for different AP version, modem_svc_sit will support devices from gs101 to zuma_pro. Bug: 372400955 Change-Id: Ib0bef5f0b5eae98af594d65f2077ff4c05eafc42 Flag: NONE local testing only --- device-oriole.mk | 2 +- device-raven.mk | 2 +- device-slider.mk | 2 +- device-whitefin.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 5e161ac..c087157 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -163,7 +163,7 @@ PRODUCT_PACKAGES += \ SHARED_MODEM_PLATFORM_VENDOR := lassen # Shared Modem Platform -include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk +include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 54cccdc..6833ea4 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -168,7 +168,7 @@ PRODUCT_PACKAGES += \ SHARED_MODEM_PLATFORM_VENDOR := lassen # Shared Modem Platform -include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk +include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-slider.mk b/device-slider.mk index f47ab65..dbbeda3 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -99,7 +99,7 @@ PRODUCT_PACKAGES += \ SHARED_MODEM_PLATFORM_VENDOR := lassen # Shared Modem Platform -include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk +include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-whitefin.mk b/device-whitefin.mk index 41a969c..4f51022 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -95,7 +95,7 @@ PRODUCT_PACKAGES += \ SHARED_MODEM_PLATFORM_VENDOR := lassen # Shared Modem Platform -include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk +include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin