From f5e15e8af36a80b9d4bc411f020f2ee54bffebff Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 21 Mar 2024 18:29:18 +0800 Subject: [PATCH 01/26] Branch bootloader prebuilts for 24Q3 release Bug: 326002225 Change-Id: I3ccb68a52a9c547ed8931fee560e0571d2a93020 --- device-lynx.mk | 8 ++++++-- lynx/BoardConfig.mk | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/device-lynx.mk b/device-lynx.mk index 3f20176..c283f01 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -160,8 +160,10 @@ include device/google/lynx/bluetooth/qti_default.mk GOODIX_CONFIG_BUILD_VERSION := g7_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/trunk endif @@ -188,8 +190,10 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/trunk endif diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index 096c845..4407dd5 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -20,8 +20,10 @@ TARGET_BOOTLOADER_BOARD_NAME := lynx RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_LYNX_RADIO_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif From a9cb7d8123379ef4e14d091e3afec082f954d75f Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 6 Mar 2024 00:43:12 +0000 Subject: [PATCH 02/26] Update lynx SVN to 39 Bug: 325156176 Change-Id: I2a7d1e94068fff910a2d970def9a5aed105fff31 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index c283f01..65a829e 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -237,7 +237,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=38 + ro.vendor.build.svn=39 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 8fce66d51fc32b1b780c5762be515264f107fcd1 Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Fri, 29 Mar 2024 01:44:52 +0000 Subject: [PATCH 03/26] Fix incorrect property Bug: 331752132 Test: Manually Change-Id: I78a89e834e5a04470cc405e4f4ae6ec2530f64e2 --- bluetooth/qti_default.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk index 625394b..7d26e5f 100644 --- a/bluetooth/qti_default.mk +++ b/bluetooth/qti_default.mk @@ -57,7 +57,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio.le_audio_connection_by_default=false # Bluetotoh Auto On feature -PRODUCT_PRODUCT_PROPERTIES += +PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.server.automatic_turn_on=true # Bluetooth HAL and Pixel extension From 34fbf67b4e344ed6c908994e0483c4283896de0f Mon Sep 17 00:00:00 2001 From: vincenttew Date: Wed, 27 Mar 2024 11:31:18 +0800 Subject: [PATCH 04/26] audio: remove non-supported analog headset Bug: 329470379 Change-Id: If029663a0973f701178aa236f327798c7e8dda0a Signed-off-by: vincenttew --- audio/lynx/config/audio_policy_configuration.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/audio/lynx/config/audio_policy_configuration.xml b/audio/lynx/config/audio_policy_configuration.xml index d085f70..9ad9384 100644 --- a/audio/lynx/config/audio_policy_configuration.xml +++ b/audio/lynx/config/audio_policy_configuration.xml @@ -131,10 +131,6 @@ - - - - @@ -154,8 +150,6 @@ - - Date: Thu, 14 Mar 2024 16:03:46 +0000 Subject: [PATCH 05/26] powerhint: set uclampmin_init value for applying CPU Load boost Bug: 329483662 Test: Manual Test Change-Id: Icd31a2abfdb724ee83a34125bb7f49e320acd947 --- powerhint.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/powerhint.json b/powerhint.json index 7a10798..106f7f0 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1975,7 +1975,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 232, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1999,7 +1999,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -2023,7 +2023,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, From a5c102e29a9406780ba0a7c48e23a6eca592d648 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 28 Mar 2024 15:32:59 +0000 Subject: [PATCH 06/26] Update lynx SVN to 40 Bug: 330382848 Change-Id: If141e1b3fbd821eaa20337d5c92b1f1dc394d601 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 65a829e..830f547 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -237,7 +237,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=39 + ro.vendor.build.svn=40 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 5ab5eb3f429e9a8023fc1582c9d8365ff1a42968 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 3 Apr 2024 23:13:32 +0000 Subject: [PATCH 07/26] Update lynx SVN to 41 Bug: 330382848 Change-Id: Ibf4ddca313b26e8e86831bfb251fa2909957ebb3 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 830f547..5e5da2e 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -237,7 +237,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=40 + ro.vendor.build.svn=41 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 3773cd4163e1787a884b8d5f26f90fbed942bb0e Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Wed, 10 Apr 2024 07:10:52 +0000 Subject: [PATCH 08/26] powerhint: set ADPF CPU_LOAD_UP CPU_LOAD_RESET values Bug: 329483662 Test: Manual Test Change-Id: I1001f1f81839e9bd696785269d72d0e30bfd7da8 --- powerhint.json | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/powerhint.json b/powerhint.json index 106f7f0..a994b70 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1975,15 +1975,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 232, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -1999,15 +1999,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2023,15 +2023,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2054,8 +2054,6 @@ "UclampMin_High": 197, "UclampMin_Low": 197, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2078,8 +2076,6 @@ "UclampMin_High": 53, "UclampMin_Low": 53, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2102,8 +2098,6 @@ "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } From 6e20ea17c9974c89499bed926ef4c859a39df908 Mon Sep 17 00:00:00 2001 From: Vic Huang Date: Thu, 11 Apr 2024 07:31:39 +0000 Subject: [PATCH 09/26] [L10] BT: Set system property for Bluetooth Auto On to false Set property bluetooth.server.automatic_turn_on default to false for Bluetooth Auto On feature. Bug: 333830111 Test: check system property value Change-Id: I5d086d88652d5c083755071d35d4670748377792 --- bluetooth/qti_default.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk index 7d26e5f..1b20fa0 100644 --- a/bluetooth/qti_default.mk +++ b/bluetooth/qti_default.mk @@ -58,7 +58,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetotoh Auto On feature PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.server.automatic_turn_on=true + bluetooth.server.automatic_turn_on=false # Bluetooth HAL and Pixel extension DEVICE_MANIFEST_FILE += \ From b997e9090c4a473dc133d08018f25da96be5a93f Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 2 Apr 2024 16:45:40 +0800 Subject: [PATCH 10/26] Switch default kernel directory and change build flag naming Bug: 309749142 Change-Id: Ifaeab036656e0a5aac391fa18a495deb5b686fec --- device-lynx.mk | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/device-lynx.mk b/device-lynx.mk index 5e5da2e..096994f 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -14,18 +14,10 @@ # limitations under the License. # -ifdef RELEASE_GOOGLE_LYNX_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_LYNX_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_LYNX_KERNEL_DIR +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_LYNX_VERSION) # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_LYNX_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_LYNX_KERNEL_DIR)/kernel-headers -else -TARGET_KERNEL_DIR ?= device/google/lynx-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/lynx-kernel/kernel-headers -endif +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_LYNX_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_LYNX_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/lynx/prebuilts/device-vendor-lynx.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) From 5bd83498a2fc77b238c5986cafcb68a4fd830127 Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Wed, 17 Apr 2024 04:12:03 +0000 Subject: [PATCH 11/26] [USB Audio AIDL] Add mixer path for "usb-device-microphones" Bug: 329147872 Test: Local test Change-Id: Idb1179a6f927187a16f2200d75497b549995f072 --- audio/lynx/aidl_config/mixer_paths_aidl.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/audio/lynx/aidl_config/mixer_paths_aidl.xml b/audio/lynx/aidl_config/mixer_paths_aidl.xml index 3b04d67..da09856 100644 --- a/audio/lynx/aidl_config/mixer_paths_aidl.xml +++ b/audio/lynx/aidl_config/mixer_paths_aidl.xml @@ -1312,7 +1312,7 @@ - + @@ -1322,6 +1322,14 @@ + + + + + + + + From 9586c78a2e3d33b6c0b2bd7ed740ca985b503e2f Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 11 Apr 2024 15:19:32 +0800 Subject: [PATCH 12/26] Switch bootloader directory to control by build flag Bug: 333834221 Change-Id: I2c7d8d9f0714d1144a0b57692dad727783a80e51 --- device-lynx.mk | 18 ------------------ lynx/BoardConfig.mk | 12 +++--------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/device-lynx.mk b/device-lynx.mk index 096994f..15a9bcd 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -150,15 +150,6 @@ include device/google/lynx/bluetooth/qti_default.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/trunk -endif $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) @@ -180,15 +171,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/trunk -endif # GPS xml ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index 4407dd5..0b74f96 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -18,15 +18,9 @@ TARGET_BOARD_INFO_FILE := device/google/lynx/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := lynx RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_LYNX_RADIO_DIR) -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_LYNX_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_LYNX_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_LYNX_DIR)) ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk From ed912e19baca340c006468037c98a5b9901a99dc Mon Sep 17 00:00:00 2001 From: Peter Lin Date: Thu, 28 Dec 2023 04:46:40 +0000 Subject: [PATCH 13/26] update educeBrightColorsStrengt setting Bug: 312329951 Test: dumpsys color_display Change-Id: I278e2814a41b1d42b337de06d1eb50911455f2a3 --- .../frameworks/base/core/res/res/values/config.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lynx/overlay/frameworks/base/core/res/res/values/config.xml b/lynx/overlay/frameworks/base/core/res/res/values/config.xml index 07118d2..8dd1bb9 100644 --- a/lynx/overlay/frameworks/base/core/res/res/values/config.xml +++ b/lynx/overlay/frameworks/base/core/res/res/values/config.xml @@ -32,6 +32,15 @@ 6 + + 35 + + + 25 + + + 50 + 0.0 From 9964e69ea85aa81531441f51fcad5e51384b9825 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 24 Apr 2024 23:08:31 +0000 Subject: [PATCH 14/26] Update lynx SVN to 42 Bug: 336526332 Change-Id: I156bc0b08e2a53d2b2ac0f5ff14f4505db8c13d8 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 15a9bcd..dd30fcf 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -211,7 +211,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=41 + ro.vendor.build.svn=42 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 3a7dfa53382da81877a2d5d81eab5000011ba775 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 25 Apr 2024 03:43:59 +0000 Subject: [PATCH 15/26] Update lynx SVN to 43 Bug: 336526332 Change-Id: I04e92d25ba10b7ddcb3e343af63b7ca80c25931a --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index dd30fcf..975d5a7 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -211,7 +211,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=42 + ro.vendor.build.svn=43 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From e344195f7971494506e8b8667212c2e307410e06 Mon Sep 17 00:00:00 2001 From: Thomas Girardier Date: Thu, 25 Apr 2024 16:23:36 +0000 Subject: [PATCH 16/26] Revert "[L10] BT: Set system property for Bluetooth Auto On to false" This reverts commit 6e20ea17c9974c89499bed926ef4c859a39df908. Reason for revert: Auto On has been approved for 24Q3 Change-Id: I15e43b5f697b689888de7184431aad250fad200d --- bluetooth/qti_default.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk index 1b20fa0..7d26e5f 100644 --- a/bluetooth/qti_default.mk +++ b/bluetooth/qti_default.mk @@ -58,7 +58,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetotoh Auto On feature PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.server.automatic_turn_on=false + bluetooth.server.automatic_turn_on=true # Bluetooth HAL and Pixel extension DEVICE_MANIFEST_FILE += \ From d0fd806ba8006af05b5e1b54ad40304b0d0d866c Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Fri, 7 Apr 2023 23:13:45 +0000 Subject: [PATCH 17/26] Add POWER_EFFICIENCY uclamp max to adpf config Add the "UclampMax_EfficientBase" value to the ADPF config in the powerhint.json to specify efficient core scheduling in the static case, and "UclampMax_EfficientOffset" for the dynamic case, for this device. Bug: 277285195 Test: manual Change-Id: I694eed1342c5becbd3161b88342cd66868ddb78b --- powerhint.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/powerhint.json b/powerhint.json index a994b70..b13f26a 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1980,6 +1980,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2004,6 +2006,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2028,6 +2032,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2053,6 +2059,8 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -2075,6 +2083,8 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -2097,6 +2107,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 From ec7559cdc8328a9c77d8aeccbd5ad66717becd28 Mon Sep 17 00:00:00 2001 From: Qian-Hao Huang Date: Thu, 2 May 2024 21:06:43 +0800 Subject: [PATCH 18/26] Load fips140.ko before all other kernel modules Bug: 337838109 Bug: 331791671 Change-Id: Ibb6b512358b43952378b2f479cfb5972b0064311 Signed-off-by: Qian-Hao Huang --- lynx/BoardConfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index 0b74f96..6ce1219 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -35,6 +35,7 @@ USES_DEVICE_GOOGLE_LYNX := true BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 include device/google/gs201/BoardConfig-common.mk From f787c2237f0590804714ff6fc2375893b5acf78f Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Mon, 6 May 2024 14:33:06 +0000 Subject: [PATCH 19/26] gps: Reduce logging mask Bug: 267729515 Bug: 312716075 Test: Verification for logging system. Test: Verification at b/267729515#comment152. Change-Id: I09bd61490fb94ad7914f52a6d8c90fcd9693643e --- location/gps.xml.l10 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/location/gps.xml.l10 b/location/gps.xml.l10 index de21762..009eb04 100644 --- a/location/gps.xml.l10 +++ b/location/gps.xml.l10 @@ -70,7 +70,7 @@ Date: Wed, 1 May 2024 18:34:17 +0800 Subject: [PATCH 20/26] Update bootloader pdk folder and soong config Bug: 333834221 Change-Id: Ia517cbe8ac5fae85428904ca9c7d7c1bc5c38098 --- lynx/BoardConfig.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index 6ce1219..b3cd8b8 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -18,9 +18,9 @@ TARGET_BOARD_INFO_FILE := device/google/lynx/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := lynx RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_LYNX_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_LYNX_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_BOOTLOADER_LYNX_DIR ?= pdk# Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_LYNX_DIR) -$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_LYNX_DIR)) +$(call soong_config_set,lynx_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_LYNX_DIR)) ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk From 35869b966077c19c2050da4d88a1d8127221cb21 Mon Sep 17 00:00:00 2001 From: guibing Date: Thu, 16 May 2024 20:49:55 +0000 Subject: [PATCH 21/26] Adpf:lynx: enable heuristic boost. Heuristic boost will adjust the ADPF boost profile when the powerhal detects the power session is very janky, providing more boost for deadline sensitive threads managered in the session. Bug: 341111433 Test: adb shell dumpsys android.hardware.power.IPower/default; Check the device adpf sessions' traces. Change-Id: I191ed6f479a8f49082d64e9fb1723884634133c7 --- powerhint.json | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/powerhint.json b/powerhint.json index b13f26a..223109b 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1987,7 +1987,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -2013,7 +2022,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -2039,7 +2057,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", From 15b00fc5f2394a025f8d19b1ce176eef2c80172b Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Mon, 13 May 2024 08:42:17 +0000 Subject: [PATCH 22/26] Vibrator: Set Soong Config variable - kernel_ver Bug: 340148508 Test: Build and check fw files in all devices. Change-Id: I64e5a50302920d63f358946a8ea840df3e1da98b --- device-lynx.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device-lynx.mk b/device-lynx.mk index 975d5a7..75d7787 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -158,6 +158,7 @@ $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factor endif # Vibrator HAL +$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.supported_primitives=243 \ From ecc1aea4223d2c735562f8ca7348a82a6f20eab2 Mon Sep 17 00:00:00 2001 From: samou Date: Wed, 15 May 2024 11:52:02 +0000 Subject: [PATCH 23/26] thermal: Remove SOFT_OCP related tzones Bug: 337976702 Test: Confirm boot Change-Id: Ib3c4f4f6f4d0c6fb6215601c96efb61585052b2e Signed-off-by: samou --- thermal_info_config_lynx.json | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/thermal_info_config_lynx.json b/thermal_info_config_lynx.json index 74a20eb..88877cc 100644 --- a/thermal_info_config_lynx.json +++ b/thermal_info_config_lynx.json @@ -736,38 +736,6 @@ "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true - }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true } ], "CoolingDevices":[ From b291562d4cf3b9087c62ef650fc557cc15351fc0 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Sat, 27 Apr 2024 01:58:07 +0800 Subject: [PATCH 24/26] audio: remove unused device Bug: 337191827 Test: build pass Change-Id: I31b44b3772b6e4bce7993781f663510ee40d7d68 Signed-off-by: Carter Hsu --- audio/lynx/config/audio_policy_configuration.xml | 2 -- .../audio_policy_configuration_a2dp_offload_disabled.xml | 8 -------- .../audio_policy_configuration_bluetooth_legacy_hal.xml | 8 -------- .../audio_policy_configuration_le_offload_disabled.xml | 8 -------- 4 files changed, 26 deletions(-) diff --git a/audio/lynx/config/audio_policy_configuration.xml b/audio/lynx/config/audio_policy_configuration.xml index 9ad9384..659c883 100644 --- a/audio/lynx/config/audio_policy_configuration.xml +++ b/audio/lynx/config/audio_policy_configuration.xml @@ -141,8 +141,6 @@ - - diff --git a/audio/lynx/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/lynx/config/audio_policy_configuration_a2dp_offload_disabled.xml index 4e8abf7..0517530 100644 --- a/audio/lynx/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/lynx/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -131,10 +131,6 @@ - - - - @@ -145,8 +141,6 @@ - - @@ -154,8 +148,6 @@ - - diff --git a/audio/lynx/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/lynx/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 2531fd4..57a8be7 100644 --- a/audio/lynx/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/lynx/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -131,10 +131,6 @@ - - - - @@ -145,8 +141,6 @@ - - @@ -154,8 +148,6 @@ - - diff --git a/audio/lynx/config/audio_policy_configuration_le_offload_disabled.xml b/audio/lynx/config/audio_policy_configuration_le_offload_disabled.xml index 067a2f5..65b432f 100644 --- a/audio/lynx/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/lynx/config/audio_policy_configuration_le_offload_disabled.xml @@ -135,10 +135,6 @@ - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - Date: Wed, 29 May 2024 10:00:24 +0000 Subject: [PATCH 25/26] Switch makefile owners to MK_OWNERS Bug: 278167548 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f7ac0c78286f5a93d0a894963fdb466fc225e438) Merged-In: Iff0ba2691a738407a3bbb86a221b20314457db24 Change-Id: Iff0ba2691a738407a3bbb86a221b20314457db24 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 7eed0c3..5524a1f 100644 --- a/OWNERS +++ b/OWNERS @@ -1,4 +1,4 @@ per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/MK_OWNERS From b35a1123388cb0f48b048216ae0f36e18e90598a Mon Sep 17 00:00:00 2001 From: Jason Hsu Date: Thu, 23 May 2024 10:51:12 +0800 Subject: [PATCH 26/26] audio: update fortemedia table on 5/23 Bug: 325559120 Test: verified by Acoustic team Change-Id: I6eaf2b19d5af8e929988ac469637e9e20af594d5 Signed-off-by: Jason Hsu --- audio/lynx/tuning/fortemedia/HANDSET.dat | Bin 255674 -> 255674 bytes audio/lynx/tuning/fortemedia/HANDSET.mods | 30 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/audio/lynx/tuning/fortemedia/HANDSET.dat b/audio/lynx/tuning/fortemedia/HANDSET.dat index 0e62c25a26a57a89314e973ed50924d1062b74a3..fc4375eee30649468da370f63b6a650e16268481 100644 GIT binary patch delta 105 zcmdmWmVeh-{t0%BVH@q|urMl2D`iS&O>t&qP?(-m%Cw8?1#>Z@fO-j|g5P$7GA1X^ cW