From 1ff2576bfed678e262fa82fc236d9cf95cd11860 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 19 Sep 2024 22:58:14 +0800 Subject: [PATCH 01/13] gps: set default SUPL SSL method to SSLv23 Bug: 363886476 Test: verify SUPL NI test pass Change-Id: I9590c44abb8cc1a2334ad4c882683db277662ef0 --- location/gps.6.1.xml.c10 | 2 +- location/gps.6.1.xml.p10 | 2 +- location/gps.xml | 2 +- location/gps.xml.c10 | 2 +- location/gps.xml.p10 | 2 +- location/gps_user.6.1.xml.c10 | 2 +- location/gps_user.6.1.xml.p10 | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.c10 | 2 +- location/gps_user.xml.p10 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/location/gps.6.1.xml.c10 b/location/gps.6.1.xml.c10 index d582845..a5ac7c3 100644 --- a/location/gps.6.1.xml.c10 +++ b/location/gps.6.1.xml.c10 @@ -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.p10 b/location/gps.6.1.xml.p10 index d132bfa..62841e5 100644 --- a/location/gps.6.1.xml.p10 +++ b/location/gps.6.1.xml.p10 @@ -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 e091ba3..d50202c 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.c10 b/location/gps.xml.c10 index 58356f4..7b1da4c 100644 --- a/location/gps.xml.c10 +++ b/location/gps.xml.c10 @@ -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.p10 b/location/gps.xml.p10 index 643c2ef..5e92649 100644 --- a/location/gps.xml.p10 +++ b/location/gps.xml.p10 @@ -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.c10 b/location/gps_user.6.1.xml.c10 index 2aa6fc4..f51614d 100644 --- a/location/gps_user.6.1.xml.c10 +++ b/location/gps_user.6.1.xml.c10 @@ -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.p10 b/location/gps_user.6.1.xml.p10 index ebbc2f7..5fd9163 100644 --- a/location/gps_user.6.1.xml.p10 +++ b/location/gps_user.6.1.xml.p10 @@ -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 463f991..1658c49 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.c10 b/location/gps_user.xml.c10 index 2f573bf..a48c8b0 100644 --- a/location/gps_user.xml.c10 +++ b/location/gps_user.xml.c10 @@ -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.p10 b/location/gps_user.xml.p10 index 1198001..bdfa5c1 100644 --- a/location/gps_user.xml.p10 +++ b/location/gps_user.xml.p10 @@ -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 58d6159b5f4c1acfd1a494ddca806cfec13364d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20Ko=C5=82odziejczyk?= Date: Tue, 16 Jul 2024 11:59:25 +0000 Subject: [PATCH 02/13] audio: enable software encoded Bluetooth broadcast Bug: 345372436 Test: manual Flag: EXEMPT, trivial change Change-Id: Ie7d3d66ed36e7d5b5f2868389b6e598cefcfc277 --- .../bluetooth_with_le_audio_policy_configuration_7_0.xml | 6 +++++- .../bluetooth_with_le_audio_policy_configuration_7_0.xml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/audio/cheetah/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/cheetah/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..efd7277 100644 --- a/audio/cheetah/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/cheetah/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + \ No newline at end of file diff --git a/audio/panther/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/panther/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..efd7277 100644 --- a/audio/panther/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/panther/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + \ No newline at end of file From 8dbfc347b89057f0fe12253d527f6dd49f1391c0 Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Wed, 25 Sep 2024 06:26:18 +0000 Subject: [PATCH 03/13] Remove vibrator HAL service Remove from device mk files due to relocation to vendor directory. Bug: 362659323 Test: Build Pass Flag: EXEMPT refactor Change-Id: I8ccf97fed8c7917f93ff4a9748fa8e3e3aa6fdc0 --- device-cheetah.mk | 1 - device-cloudripper.mk | 1 - device-panther.mk | 1 - device-ravenclaw.mk | 1 - 4 files changed, 4 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 4bfe74a..5310870 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -48,7 +48,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/cheetah/overlay include device/google/pantah/audio/cheetah/audio-tables.mk include device/google/gs201/device-shipping-common.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/syna/syna0.mk diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 4896cda..6a3638f 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -38,7 +38,6 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/cloud include device/google/gs201/device-shipping-common.mk include device/google/pantah/audio/cloudripper/audio-tables.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/gps/brcm/cbd_gps.mk include device/google/gs-common/touch/syna/syna0.mk diff --git a/device-panther.mk b/device-panther.mk index a50f2ea..08cf3bb 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -46,7 +46,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/panther/overlay include device/google/pantah/audio/panther/audio-tables.mk include device/google/gs201/device-shipping-common.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/focaltech/focaltech.mk diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 115bdc7..86c1858 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -38,7 +38,6 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/raven include device/google/gs201/device-shipping-common.mk include device/google/pantah/audio/ravenclaw/audio-tables.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/lsi/lsi.mk From cedffc0b92712ac008cba51fa8803c34d37192fc Mon Sep 17 00:00:00 2001 From: Jim Tang Date: Fri, 4 Oct 2024 15:56:41 +0800 Subject: [PATCH 04/13] Move modem_svc_sit from gs201 to pantah Module `modem_svc_sit` is not valid unless: * USES_LASSEN_MODEM is true * BOARD_WITHOUT_RADIO is NOT true (or NOT set) Devices in gs201 family will set "USES_LASSEN_MODEM := true"; however, not evevy gs201 device disables BOARD_WITHOUT_RADIO. This commit defines PRODUCT_PACKAGES `modem_svc_sit` because it is converted from bp by moving the if-statement constrain from the module level to device level. Flag: EXEMPT refactor Bug: 358485346 Test: m modem_svc_sit Change-Id: Ie8ab9f12007b0faa3fb90e9ff0b0bb3f66e20593 --- device-cheetah.mk | 3 +++ device-cloudripper.mk | 3 +++ device-panther.mk | 3 +++ factory_ravenclaw.mk | 3 +++ 4 files changed, 12 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 5310870..719ccd6 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -130,6 +130,9 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayCheetah +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto \ diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 6a3638f..527cb14 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -79,6 +79,9 @@ PRODUCT_PACKAGES += \ Tag \ android.hardware.nfc-service.st +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto \ diff --git a/device-panther.mk b/device-panther.mk index 08cf3bb..f376135 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -109,6 +109,9 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayPanther +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto \ diff --git a/factory_ravenclaw.mk b/factory_ravenclaw.mk index cd07164..0e2b679 100644 --- a/factory_ravenclaw.mk +++ b/factory_ravenclaw.mk @@ -29,3 +29,6 @@ PRODUCT_MANUFACTURER := Google # default BDADDR for EVB only PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" + +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit From e87bccccca2cde47640db2bf27f56bcc67e16b16 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Thu, 26 Sep 2024 12:18:13 -0700 Subject: [PATCH 05/13] pantah: Pull init.insmod.*.cfg from vendor_dlkm We've started pushing init.insmod.*.cfg into the kernel prebuilts, and installing it to /vendor_dlkm/etc, but it may not be available on all prebuilt variants (e.g., kernel 5.10). Here, we: 1. conditionally install our common init.*cfg to /vendor_dlkm (only if $(TARGET_KERNEL_DIR) doesn't have a copy) 2. point init at /vendor_dlkm/etc When we've cycled completely off of kernel 5.10, we can drop #1. Bug: 369686096 Test: build, boot Flag: EXEMPT refactor Change-Id: Iff56b163d332d6226c05ff56f7838b3ad9806674 --- conf/init.cloudripper.rc | 2 +- conf/init.pantah.rc | 2 +- conf/init.ravenclaw.rc | 2 +- device-cheetah.mk | 10 +++++++--- device-cloudripper.mk | 8 ++++++-- device-panther.mk | 8 ++++++-- device-ravenclaw.mk | 8 ++++++-- 7 files changed, 28 insertions(+), 12 deletions(-) diff --git a/conf/init.cloudripper.rc b/conf/init.cloudripper.rc index 53c7e91..9cf49a2 100644 --- a/conf/init.cloudripper.rc +++ b/conf/init.cloudripper.rc @@ -15,7 +15,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_cloudripper -service insmod_sh_cloudripper /vendor/bin/insmod.sh /vendor/etc/init.insmod.cloudripper.cfg +service insmod_sh_cloudripper /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.cloudripper.cfg class main user root group root system diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 7fe3687..a404bb5 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -13,7 +13,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_pantah -service insmod_sh_pantah /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg +service insmod_sh_pantah /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg class main user root group root system diff --git a/conf/init.ravenclaw.rc b/conf/init.ravenclaw.rc index 0482aa6..5b0c9aa 100644 --- a/conf/init.ravenclaw.rc +++ b/conf/init.ravenclaw.rc @@ -15,7 +15,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_ravenclaw -service insmod_sh_ravenclaw /vendor/bin/insmod.sh /vendor/etc/init.insmod.ravenclaw.cfg +service insmod_sh_ravenclaw /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.ravenclaw.cfg class main user root group root system diff --git a/device-cheetah.mk b/device-cheetah.mk index 719ccd6..15b8c15 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -72,9 +72,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.cheetah.rc -# insmod files +# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our +# own copy if they're not in the prebuilts. +# TODO(b/369686096): drop this when 5.10 is gone. +ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),) PRODUCT_COPY_FILES += \ - device/google/pantah/init.insmod.cheetah.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cheetah.cfg + device/google/pantah/init.insmod.cheetah.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.cheetah.cfg +endif # MIPI Coex Configs PRODUCT_COPY_FILES += \ @@ -477,4 +481,4 @@ ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) endif -endif \ No newline at end of file +endif diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 527cb14..5c7f213 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -55,9 +55,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.cloudripper.rc -# insmod files +# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our +# own copy if they're not in the prebuilts. +# TODO(b/369686096): drop this when 5.10 is gone. +ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),) PRODUCT_COPY_FILES += \ - device/google/pantah/init.insmod.cloudripper.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cloudripper.cfg + device/google/pantah/init.insmod.cloudripper.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.cloudripper.cfg +endif # Camera PRODUCT_COPY_FILES += \ diff --git a/device-panther.mk b/device-panther.mk index f376135..38d6608 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -63,9 +63,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.panther.rc -# insmod files +# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our +# own copy if they're not in the prebuilts. +# TODO(b/369686096): drop this when 5.10 is gone. +ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),) PRODUCT_COPY_FILES += \ - device/google/pantah/init.insmod.panther.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.panther.cfg + device/google/pantah/init.insmod.panther.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.panther.cfg +endif # MIPI Coex Configs PRODUCT_COPY_FILES += \ diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 86c1858..1c205eb 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -59,9 +59,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/pantah/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.ravenclaw.rc -# insmod files +# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our +# own copy if they're not in the prebuilts. +# TODO(b/369686096): drop this when 5.10 is gone. +ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),) PRODUCT_COPY_FILES += \ - device/google/pantah/init.insmod.ravenclaw.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.ravenclaw.cfg + device/google/pantah/init.insmod.ravenclaw.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.ravenclaw.cfg +endif # Camera PRODUCT_COPY_FILES += \ From d2145494f004631bc455b5d5d8803af9a7c2baa6 Mon Sep 17 00:00:00 2001 From: Eileen Lai Date: Wed, 9 Oct 2024 08:07:17 +0000 Subject: [PATCH 06/13] modem_svc: use shared_modem_platform to replace all modem_svc_sit Bug: 368257019 Flag: EXEMPT resource only update Change-Id: Iba54f9fbbad25c236feb265ff04545998a7134e5 --- device-cheetah.mk | 7 +++++-- device-cloudripper.mk | 7 +++++-- device-panther.mk | 7 +++++-- factory_ravenclaw.mk | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 15b8c15..34276c3 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -134,8 +134,11 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayCheetah -# modem_svc_sit daemon -PRODUCT_PACKAGES += modem_svc_sit +# Shared Modem Platform +SHARED_MODEM_PLATFORM_VENDOR := lassen + +# Shared Modem Platform +include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 5c7f213..151f1db 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -83,8 +83,11 @@ PRODUCT_PACKAGES += \ Tag \ android.hardware.nfc-service.st -# modem_svc_sit daemon -PRODUCT_PACKAGES += modem_svc_sit +# Shared Modem Platform +SHARED_MODEM_PLATFORM_VENDOR := lassen + +# Shared Modem Platform +include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-panther.mk b/device-panther.mk index 38d6608..2d92c63 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -113,8 +113,11 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayPanther -# modem_svc_sit daemon -PRODUCT_PACKAGES += modem_svc_sit +# Shared Modem Platform +SHARED_MODEM_PLATFORM_VENDOR := lassen + +# Shared Modem Platform +include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/factory_ravenclaw.mk b/factory_ravenclaw.mk index 0e2b679..f11f738 100644 --- a/factory_ravenclaw.mk +++ b/factory_ravenclaw.mk @@ -30,5 +30,8 @@ PRODUCT_MANUFACTURER := Google PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" -# modem_svc_sit daemon -PRODUCT_PACKAGES += modem_svc_sit +# Shared Modem Platform +SHARED_MODEM_PLATFORM_VENDOR := lassen + +# Shared Modem Platform +include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk From 99a2848193647b8c40d72f44ff6616ff285511d7 Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Fri, 2 Aug 2024 19:44:40 +0000 Subject: [PATCH 07/13] [pantah] Define CAMERA_MULTICAM_BOOST Port from ag/28607900 This CL defines CAMERA_MULTICAM_BOOST (with the same settings as the existing CAMERA_ZOOMING_BOOST). Having both definitions is necessary to be able to transition from zooming boost to multicam boost. Once the multicam boost flag is fully rolled out, we can remove the CAMERA_ZOOMING_BOOST. Bug: 347829135 Test: adb logcat Flag: EXEMPT resource file only change Change-Id: I9da2cdfe5c23aab43b5189788b0a90f2780d5f6f --- powerhint-cheetah-a0.json | 12 ++++++++++++ powerhint-cheetah.json | 12 ++++++++++++ powerhint-panther-a0.json | 12 ++++++++++++ powerhint-panther.json | 12 ++++++++++++ 4 files changed, 48 insertions(+) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 0d0a92c..fe84255 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -995,6 +995,18 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index f7f991e..802422b 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -1135,6 +1135,18 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index d75dfca..22aaa14 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -984,6 +984,18 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "Node": "TAPreferHighCap", diff --git a/powerhint-panther.json b/powerhint-panther.json index 866fb9c..cb203c4 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -1093,6 +1093,18 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "Node": "TAPreferHighCap", From 38c5d366ef4a32751f0642a2cf9c9e34f50dbcba Mon Sep 17 00:00:00 2001 From: Kyle Hsiao Date: Tue, 5 Nov 2024 03:03:40 +0000 Subject: [PATCH 08/13] Update ISODEP routing setting Bug: 323953256 Test: manual Flag: EXEMPT bugfix Change-Id: Ic809f837493ea92b47545dde7b5cf7c52831326f --- nfc/libnfc-hal-st.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index ee5feaa..bcce399 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -135,7 +135,7 @@ OFFHOST_ROUTE_ESE={86} # host 0x00 # eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) # UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_ISODEP_ROUTE=0x81 +DEFAULT_ISODEP_ROUTE=0x00 ############################################################################### # Configure the HAL Clock control From 4258e9174ffb8222cdf724b49debc907b5476f71 Mon Sep 17 00:00:00 2001 From: Isaac Chiou Date: Fri, 1 Nov 2024 07:12:38 +0000 Subject: [PATCH 09/13] Disable Wifi BugReport for subsystem restart Flag: EXEMPT gated by overlay Bug: 373594936 Test: Manuel test, trigger SSR and won't create bugreport automatically Change-Id: I09c7abe0a1ce0d5eada4bc7c9b02d329954da1c8 --- cheetah/rro_overlays/WifiOverlay/res/values/config.xml | 2 ++ panther/rro_overlays/WifiOverlay/res/values/config.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml index d80000b..9525293 100644 --- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml @@ -179,4 +179,6 @@ false: firmware roaming will not be affected. --> true + + false diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml index 23d08d3..00d26c8 100644 --- a/panther/rro_overlays/WifiOverlay/res/values/config.xml +++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml @@ -179,4 +179,6 @@ false: firmware roaming will not be affected. --> true + + false From 05b6cbe100f9a9e3a298a2a76be4f8245f70cc1c Mon Sep 17 00:00:00 2001 From: Barry Date: Mon, 25 Nov 2024 02:20:46 +0000 Subject: [PATCH 10/13] Update P22 Bluetooth LEA unicast allowlist: Samsung Galaxy Buds 3 pro Add Samsung Galaxy Buds 3 pro into unicast default allowlist. bug: 380370088 Test: PTE PQM-BT LE audio unicast test Flag: EXEMPT The Samsung Galaxy Buds 3 pro users are able to disable LE audio in Settings app Change-Id: I807492d3c54a44797bcc9aafdc6185e9ed0eb1bf --- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 34276c3..3d3989a 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -244,7 +244,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 + persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630 # Support LE & Classic concurrent encryption (b/330704060) PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-panther.mk b/device-panther.mk index 2d92c63..91fe564 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -214,7 +214,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 + persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630 # Support LE & Classic concurrent encryption (b/330704060) PRODUCT_PRODUCT_PROPERTIES += \ From 6606b836c58b9b180811d2ea4bc3ca909a7c74a6 Mon Sep 17 00:00:00 2001 From: Zouberou Sayibou Date: Sun, 1 Dec 2024 04:43:53 +0000 Subject: [PATCH 11/13] pantah/haptics: Remove voltage restriction for haptics Remove the voltage restriction for haptics since DVL is enabled. This will allow FW control for exertion protection of the motor, and allow for stronger output for audio-haptics. Bug: 318476589 Flag: EXEMPT config json change Test: dumpsys vibrator_manager and accel measurement Change-Id: I8f4b8ed97056bb678e4191a87d6c12832a1c3926 Signed-off-by: Zouberou Sayibou --- cheetah/overlay/frameworks/base/core/res/res/values/config.xml | 3 --- panther/overlay/frameworks/base/core/res/res/values/config.xml | 3 --- 2 files changed, 6 deletions(-) diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml index 392c5ec..d578c7b 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml @@ -180,9 +180,6 @@ com.google.sensor.quick_pickup - - 0.335 - 2 3 diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml index 014f57a..1526dc4 100644 --- a/panther/overlay/frameworks/base/core/res/res/values/config.xml +++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml @@ -202,9 +202,6 @@ com.google.sensor.quick_pickup - - 0.335 - 2 3 From 2eb5220301b18807bb074c98466f920c6ffbcdd2 Mon Sep 17 00:00:00 2001 From: Zouberou Sayibou Date: Tue, 3 Dec 2024 02:47:11 +0000 Subject: [PATCH 12/13] Revert "pantah/haptics: Remove voltage restriction for haptics" Revert submission 30661505-tdm_amplitude_limitation_removal_dvl Reason for revert: short time to properly test before 25q1 cut-off. Reverted changes: /q/submissionid:30661505-tdm_amplitude_limitation_removal_dvl Bug: 318476589 Change-Id: If7eab4922ef59e7c23624ca8b1454c8d09569544 --- cheetah/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ panther/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml index d578c7b..392c5ec 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml @@ -180,6 +180,9 @@ com.google.sensor.quick_pickup + + 0.335 + 2 3 diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml index 1526dc4..014f57a 100644 --- a/panther/overlay/frameworks/base/core/res/res/values/config.xml +++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml @@ -202,6 +202,9 @@ com.google.sensor.quick_pickup + + 0.335 + 2 3 From 6f0b32823ad4bf7c08ed57a7e6bd442d0b8f2c56 Mon Sep 17 00:00:00 2001 From: Eileen Lai Date: Sun, 8 Dec 2024 07:39:32 +0000 Subject: [PATCH 13/13] 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: I640f6ddf7d744e5edb6d48b209b95d1dd0ad6eb1 Flag: NONE local testing only --- device-cheetah.mk | 2 +- device-cloudripper.mk | 2 +- device-panther.mk | 2 +- factory_ravenclaw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 3d3989a..67dde2d 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -138,7 +138,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-cloudripper.mk b/device-cloudripper.mk index 151f1db..2c02475 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -87,7 +87,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-panther.mk b/device-panther.mk index 91fe564..d4e660b 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -117,7 +117,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/factory_ravenclaw.mk b/factory_ravenclaw.mk index f11f738..9028a9d 100644 --- a/factory_ravenclaw.mk +++ b/factory_ravenclaw.mk @@ -34,4 +34,4 @@ PRODUCT_PROPERTY_OVERRIDES += \ 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