From 473d21970c8c5f1967f56bc4afc6c42aca22b6e7 Mon Sep 17 00:00:00 2001 From: Jim Tang Date: Fri, 4 Oct 2024 15:52:20 +0800 Subject: [PATCH 1/5] Move modem_svc_sit from gs201 to lynx 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, device-lynx.mk in this case. Flag: EXEMPT refactor Bug: 358485346 Test: m modem_svc_sit Change-Id: Idd5dba13db6ee259df507d94ce7a83d5b27af29c --- device-lynx.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-lynx.mk b/device-lynx.mk index 86f5409..00d3437 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -86,6 +86,9 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayLynx +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto \ From 22dd220a6cb58c4a92fe55d8b575718b334d143a Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Thu, 26 Sep 2024 12:18:13 -0700 Subject: [PATCH 2/5] lynx: 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: Ife4ea982c73a1e91db075dc4798603fca1ca521f --- conf/init.lynx.rc | 2 +- device-lynx.mk | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/conf/init.lynx.rc b/conf/init.lynx.rc index 1a427dc..ee6e30f 100644 --- a/conf/init.lynx.rc +++ b/conf/init.lynx.rc @@ -16,7 +16,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_lynx -service insmod_sh_lynx /vendor/bin/insmod.sh /vendor/etc/init.insmod.lynx.cfg +service insmod_sh_lynx /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.lynx.cfg class main user root group root system diff --git a/device-lynx.mk b/device-lynx.mk index 00d3437..29ff5b1 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -46,9 +46,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/lynx/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.lynx.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/lynx/init.insmod.lynx.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.lynx.cfg + device/google/lynx/init.insmod.lynx.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.lynx.cfg +endif # Camera PRODUCT_COPY_FILES += \ From b01091a241f4acb0ce355489f6b53c80f2e2530f Mon Sep 17 00:00:00 2001 From: Eileen Lai Date: Wed, 9 Oct 2024 08:00:33 +0000 Subject: [PATCH 3/5] modem_svc: use shared_modem_platform to replace all modem_svc_sit Bug: 368257019 Flag: EXEMPT resource only update Change-Id: I94847284c1795fea9f12f2506d86251b08453267 --- device-lynx.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/device-lynx.mk b/device-lynx.mk index 29ff5b1..b6ac258 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -90,8 +90,11 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayLynx -# 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 += \ From d5101697fb4ec5b6f230cca3138acdf11d0ea45d Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Fri, 2 Aug 2024 20:09:05 +0000 Subject: [PATCH 4/5] [lynx] 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: I0a72375b98f93fd8a09f116bed983e24644ecbfa --- powerhint.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/powerhint.json b/powerhint.json index 7434a2b..022c6f1 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1048,6 +1048,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 ae2ed690b9c3370b9e4e2bdcaaf672fdef53311a Mon Sep 17 00:00:00 2001 From: Kyle Hsiao Date: Tue, 5 Nov 2024 03:03:40 +0000 Subject: [PATCH 5/5] 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 b0a7564..3db58a0 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