From bc19c19239b1e023de5760ec9c44925242d399f1 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 19 Sep 2024 22:51:09 +0800 Subject: [PATCH 1/8] gps: set default SUPL SSL method to SSLv23 Bug: 363886476 Test: verify SUPL NI test pass Change-Id: I7a1ff29ea0f18c2d339091aaec5b723fa7fdbf17 --- gps.6.1.xml.b3 | 2 +- gps.xml.b3 | 2 +- gps_user.6.1.xml.b3 | 2 +- gps_user.xml.b3 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gps.6.1.xml.b3 b/gps.6.1.xml.b3 index 9ab8fc6..555522f 100644 --- a/gps.6.1.xml.b3 +++ b/gps.6.1.xml.b3 @@ -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/gps.xml.b3 b/gps.xml.b3 index 777f50a..ce53e8c 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -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/gps_user.6.1.xml.b3 b/gps_user.6.1.xml.b3 index 8679528..484dd89 100644 --- a/gps_user.6.1.xml.b3 +++ b/gps_user.6.1.xml.b3 @@ -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/gps_user.xml.b3 b/gps_user.xml.b3 index 7b4ce7a..35e76aa 100644 --- a/gps_user.xml.b3 +++ b/gps_user.xml.b3 @@ -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 34289b872cef50619b8e09741bf6e635a8c74545 Mon Sep 17 00:00:00 2001 From: Paulsu Su Date: Tue, 24 Sep 2024 12:09:39 +0000 Subject: [PATCH 2/8] powerhint: fix json syntax for wbs test Bug: 369322087 Change-Id: I31c1fa64b9904e7ba2223f370e5040ffcd2c3201 Test: boot to home Flag: EXEMPT powerhint does not support flag --- powerhint.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerhint.json b/powerhint.json index d978ba9..4fcdb12 100644 --- a/powerhint.json +++ b/powerhint.json @@ -328,7 +328,7 @@ "Values": [ "0", "1" - ], + ] }, { "Name": "LimitFlashCurrent", From cff96f4dad77e2e2981dd3f486d4a2adcbed1c0e Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Wed, 25 Sep 2024 06:24:57 +0000 Subject: [PATCH 3/8] 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: Ib56940afcc061b9c8dcce60a2da7822a7d23973a --- device-bluejay.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 7c70b6e..ad5fd58 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -36,7 +36,6 @@ include device/google/bluejay-sepolicy/bluejay-sepolicy.mk include device/google/bluejay/audio/bluejay/audio-tables.mk include device/google/gs101/device-shipping-common.mk include device/google/gs101/telephony/pktrouter.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk From 7fc6a2ad0523d3775160970e1320570f5d724801 Mon Sep 17 00:00:00 2001 From: Jim Tang Date: Fri, 4 Oct 2024 15:18:07 +0800 Subject: [PATCH 4/8] Move modem_svc_sit from gs101 to bluejay Module `modem_svc_sit` is not valid unless: * USES_LASSEN_MODEM is true * BOARD_WITHOUT_RADIO is NOT true (or NOT set) Devices in gs101 family will set "USES_LASSEN_MODEM := true"; however, not evevy gs101 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-bluejay.mk in this case. Flag: EXEMPT refactor Bug: 358485346 Test: m modem_svc_sit Change-Id: I4734bf707a853981bea212d0b9024fdc602f6096 --- device-bluejay.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 7c70b6e..3528beb 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -111,6 +111,9 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayBluejay +# modem_svc_sit daemon +PRODUCT_PACKAGES += modem_svc_sit + # SecureElement PRODUCT_PACKAGES += \ android.hardware.secure_element@1.2-service-gto From 1a653acd2147a02f392468d52e2250d5cd79a1af Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Thu, 26 Sep 2024 12:18:13 -0700 Subject: [PATCH 5/8] bluejay: 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: Iae1690cbc337bcb3dcf9ccb972c96acd778bb9bc --- conf/init.blueport.rc | 2 +- device-bluejay.mk | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/conf/init.blueport.rc b/conf/init.blueport.rc index 5f411f8..0cf933a 100644 --- a/conf/init.blueport.rc +++ b/conf/init.blueport.rc @@ -17,7 +17,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_blueport -service insmod_sh_blueport /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg +service insmod_sh_blueport /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg class main user root group root system diff --git a/device-bluejay.mk b/device-bluejay.mk index 7c70b6e..7c64874 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -63,9 +63,13 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.bluejay.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/bluejay/init.insmod.bluejay.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.bluejay.cfg + device/google/bluejay/init.insmod.bluejay.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.bluejay.cfg +endif # Thermal Config PRODUCT_COPY_FILES += \ From e2d874b36931622adb4a3935f115b8991bfba870 Mon Sep 17 00:00:00 2001 From: Eileen Lai Date: Wed, 9 Oct 2024 07:25:08 +0000 Subject: [PATCH 6/8] modem_svc: use shared_modem_platform to replace all modem_svc_sit Bug: 368257019 Flag: NONE local testing only Change-Id: I948a1b73db6eb0a7228f7c87380240c9bf9303ef --- device-bluejay.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 2a48352..e5ae365 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -114,8 +114,11 @@ PRODUCT_PACKAGES += \ android.hardware.nfc-service.st \ NfcOverlayBluejay -# 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 4cda2110a2cb86e0db7517f89d2ad1d81b7e89bc Mon Sep 17 00:00:00 2001 From: Kyle Hsiao Date: Tue, 5 Nov 2024 03:03:40 +0000 Subject: [PATCH 7/8] 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 7300e21..ac8c20d 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 5581e8035a3f93bf8dd735047e59d8ca903446fb Mon Sep 17 00:00:00 2001 From: Eileen Lai Date: Sun, 8 Dec 2024 07:38:26 +0000 Subject: [PATCH 8/8] 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: I99b870299241be06858bf4e5210ad991a344ce6a Flag: NONE local testing only --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index e5ae365..475aa04 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -118,7 +118,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 += \