From 8f82ebc72c2eef199ce7b2984adea2a61309cc11 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Fri, 7 Apr 2023 23:18:14 +0000 Subject: [PATCH 01/30] 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: Ibeca70e171d8c15ec73eb57cd8dd7a5bf21eaea5 --- powerhint.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/powerhint.json b/powerhint.json index d68ff49..52d38f9 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1941,6 +1941,8 @@ "UclampMin_Init": 232, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1965,6 +1967,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1989,6 +1993,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2016,6 +2022,8 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2040,6 +2048,8 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2064,6 +2074,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, From 10a4784c6bb9897ac1295bab2a0744f5a2483e8d Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 21 Mar 2024 18:24:36 +0800 Subject: [PATCH 02/30] Branch bootloader prebuilts for 24Q3 release Bug: 326002225 Change-Id: I692d1ffbd7f3ae425a84fce55c4bc537f0e2c4d8 --- device-felix.mk | 4 +++- felix/BoardConfig.mk | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/device-felix.mk b/device-felix.mk index 09e147f..c868b1f 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -272,8 +272,10 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/trunk endif diff --git a/felix/BoardConfig.mk b/felix/BoardConfig.mk index a1ed5db..9ca6580 100644 --- a/felix/BoardConfig.mk +++ b/felix/BoardConfig.mk @@ -23,8 +23,10 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_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 662666134fbc1977fb83a555ffaa5c7c816d62e0 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 21 Mar 2024 21:45:27 +0000 Subject: [PATCH 03/30] Update felix SVN to 48 Bug: 325156176 Change-Id: Ifd4c3df67510d9f7cf5a88b9269614572b5eb0bc --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index b568e6a..e6266fe 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -224,7 +224,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=47 + ro.vendor.build.svn=48 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 75d87040c7284b0d0ef2f20e5edd2e2d384d943c Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Thu, 21 Mar 2024 15:16:14 +0000 Subject: [PATCH 04/30] cs40l26: Align Felix Hal with common HAL Pull ag/22589260 to replace new/delete by using vector from the common HAL. Bug: 322648133 Test: idlcli compose commands Test: adb shell cmd vibrator_manager synced prebaked 1 Test: adb shell idlcli vibrator compose 0 8 1.0; \ sleep 1; adb shell idlcli vibrator compose 0 7 1.0; Test: atest PtsVibratorHalTestSuite \ PtsHapticsTestCases \ VibratorHalCs40l26TestSuitePrivate \ VtsHalVibratorManagerTargetTest \ VtsHalVibratorTargetTest \ android.os.cts.VibratorTest \ android.os.cts.VibratorManagerTest \ android.os.cts.VibrationEffectTest \ android.os.cts.VibrationAttributesTest \ android.os.cts.CombinedVibrationTest Change-Id: Ia6e9111c47f27089521f05a68b538bbefb235d6b --- vibrator/cs40l26/Hardware.h | 25 +++++++++++++++++-------- vibrator/cs40l26/Vibrator.cpp | 28 +++++++++++++++++++++------- vibrator/cs40l26/Vibrator.h | 2 ++ 3 files changed, 40 insertions(+), 15 deletions(-) diff --git a/vibrator/cs40l26/Hardware.h b/vibrator/cs40l26/Hardware.h index af8d120..69cf9ae 100644 --- a/vibrator/cs40l26/Hardware.h +++ b/vibrator/cs40l26/Hardware.h @@ -104,18 +104,25 @@ class HwApi : public Vibrator::HwApi, private HwApiBase { .code = FF_GAIN, .value = value, }; + if (value > 100) { + ALOGE("Invalid gain"); + return false; + } if (write(fd, (const void *)&gain, sizeof(gain)) != sizeof(gain)) { return false; } return true; } bool setFFEffect(int fd, struct ff_effect *effect, uint16_t timeoutMs) override { + if (effect == nullptr) { + ALOGE("Invalid ff_effect"); + return false; + } if (ioctl(fd, EVIOCSFF, effect) < 0) { ALOGE("setFFEffect fail"); return false; - } else { - return true; } + return true; } bool setFFPlay(int fd, int8_t index, bool value) override { struct input_event play = { @@ -186,14 +193,17 @@ class HwApi : public Vibrator::HwApi, private HwApiBase { } bool uploadOwtEffect(int fd, const uint8_t *owtData, const uint32_t numBytes, struct ff_effect *effect, uint32_t *outEffectIndex, int *status) override { - (*effect).u.periodic.custom_len = numBytes / sizeof(uint16_t); - delete[] ((*effect).u.periodic.custom_data); - (*effect).u.periodic.custom_data = new int16_t[(*effect).u.periodic.custom_len]{0x0000}; - if ((*effect).u.periodic.custom_data == nullptr) { - ALOGE("Failed to allocate memory for custom data\n"); + if (owtData == nullptr || effect == nullptr || outEffectIndex == nullptr) { + ALOGE("Invalid argument owtData, ff_effect or outEffectIndex"); *status = EX_NULL_POINTER; return false; } + if (status == nullptr) { + ALOGE("Invalid argument status"); + return false; + } + + (*effect).u.periodic.custom_len = numBytes / sizeof(uint16_t); memcpy((*effect).u.periodic.custom_data, owtData, numBytes); if ((*effect).id != -1) { @@ -204,7 +214,6 @@ class HwApi : public Vibrator::HwApi, private HwApiBase { (*effect).id = -1; if (ioctl(fd, EVIOCSFF, effect) < 0) { ALOGE("Failed to upload effect %d (%d): %s", *outEffectIndex, errno, strerror(errno)); - delete[] ((*effect).u.periodic.custom_data); *status = EX_ILLEGAL_STATE; return false; } diff --git a/vibrator/cs40l26/Vibrator.cpp b/vibrator/cs40l26/Vibrator.cpp index 2abe72e..b3ce88e 100644 --- a/vibrator/cs40l26/Vibrator.cpp +++ b/vibrator/cs40l26/Vibrator.cpp @@ -44,7 +44,6 @@ namespace aidl { namespace android { namespace hardware { namespace vibrator { -static constexpr uint8_t FF_CUSTOM_DATA_LEN = 2; static constexpr uint16_t FF_CUSTOM_DATA_LEN_MAX_COMP = 2044; // (COMPOSE_SIZE_MAX + 1) * 8 + 4 static constexpr uint16_t FF_CUSTOM_DATA_LEN_MAX_PWLE = 2302; @@ -488,19 +487,23 @@ Vibrator::Vibrator(std::unique_ptr hwApiDefault, std::unique_ptr h mEffectDurations = { 1000, 100, 12, 1000, 300, 130, 150, 500, 100, 5, 12, 1000, 1000, 1000, }; /* 11+3 waveforms. The duration must < UINT16_MAX */ + mEffectCustomData.reserve(WAVEFORM_MAX_INDEX); uint8_t effectIndex; + uint16_t numBytes = 0; for (effectIndex = 0; effectIndex < WAVEFORM_MAX_INDEX; effectIndex++) { if (effectIndex < WAVEFORM_MAX_PHYSICAL_INDEX) { /* Initialize physical waveforms. */ + mEffectCustomData.push_back({RAM_WVFRM_BANK, effectIndex}); mFfEffects[effectIndex] = { .type = FF_PERIODIC, .id = -1, // Length == 0 to allow firmware control of the duration .replay.length = 0, .u.periodic.waveform = FF_CUSTOM, - .u.periodic.custom_data = new int16_t[2]{RAM_WVFRM_BANK, effectIndex}, - .u.periodic.custom_len = FF_CUSTOM_DATA_LEN, + .u.periodic.custom_data = mEffectCustomData[effectIndex].data(), + .u.periodic.custom_len = + static_cast(mEffectCustomData[effectIndex].size()), }; // Bypass the waveform update due to different input name if ((strstr(inputEventName, "cs40l26") != nullptr) || @@ -518,12 +521,16 @@ Vibrator::Vibrator(std::unique_ptr hwApiDefault, std::unique_ptr h } } else { /* Initiate placeholders for OWT effects. */ + numBytes = effectIndex == WAVEFORM_COMPOSE ? FF_CUSTOM_DATA_LEN_MAX_COMP + : FF_CUSTOM_DATA_LEN_MAX_PWLE; + std::vector tempVec(numBytes, 0); + mEffectCustomData.push_back(std::move(tempVec)); mFfEffects[effectIndex] = { .type = FF_PERIODIC, .id = -1, .replay.length = 0, .u.periodic.waveform = FF_CUSTOM, - .u.periodic.custom_data = nullptr, + .u.periodic.custom_data = mEffectCustomData[effectIndex].data(), .u.periodic.custom_len = 0, }; } @@ -532,18 +539,21 @@ Vibrator::Vibrator(std::unique_ptr hwApiDefault, std::unique_ptr h // ====================HAL internal effect table== Flip ================================== if (mIsDual) { mFfEffectsDual.resize(WAVEFORM_MAX_INDEX); + mEffectCustomDataDual.reserve(WAVEFORM_MAX_INDEX); for (effectIndex = 0; effectIndex < WAVEFORM_MAX_INDEX; effectIndex++) { if (effectIndex < WAVEFORM_MAX_PHYSICAL_INDEX) { /* Initialize physical waveforms. */ + mEffectCustomDataDual.push_back({RAM_WVFRM_BANK, effectIndex}); mFfEffectsDual[effectIndex] = { .type = FF_PERIODIC, .id = -1, // Length == 0 to allow firmware control of the duration .replay.length = 0, .u.periodic.waveform = FF_CUSTOM, - .u.periodic.custom_data = new int16_t[2]{RAM_WVFRM_BANK, effectIndex}, - .u.periodic.custom_len = FF_CUSTOM_DATA_LEN, + .u.periodic.custom_data = mEffectCustomDataDual[effectIndex].data(), + .u.periodic.custom_len = + static_cast(mEffectCustomDataDual[effectIndex].size()), }; // Bypass the waveform update due to different input name if ((strstr(inputEventName, "cs40l26") != nullptr) || @@ -563,12 +573,16 @@ Vibrator::Vibrator(std::unique_ptr hwApiDefault, std::unique_ptr h } } else { /* Initiate placeholders for OWT effects. */ + numBytes = effectIndex == WAVEFORM_COMPOSE ? FF_CUSTOM_DATA_LEN_MAX_COMP + : FF_CUSTOM_DATA_LEN_MAX_PWLE; + std::vector tempVec(numBytes, 0); + mEffectCustomDataDual.push_back(std::move(tempVec)); mFfEffectsDual[effectIndex] = { .type = FF_PERIODIC, .id = -1, .replay.length = 0, .u.periodic.waveform = FF_CUSTOM, - .u.periodic.custom_data = nullptr, + .u.periodic.custom_data = mEffectCustomDataDual[effectIndex].data(), .u.periodic.custom_len = 0, }; } diff --git a/vibrator/cs40l26/Vibrator.h b/vibrator/cs40l26/Vibrator.h index 06bd6e5..8f89713 100644 --- a/vibrator/cs40l26/Vibrator.h +++ b/vibrator/cs40l26/Vibrator.h @@ -218,6 +218,8 @@ class Vibrator : public BnVibrator { std::vector mFfEffects; std::vector mFfEffectsDual; std::vector mEffectDurations; + std::vector> mEffectCustomData; + std::vector> mEffectCustomDataDual; std::future mAsyncHandle; ::android::base::unique_fd mInputFd; ::android::base::unique_fd mInputFdDual; From 5f25b6c426cb1e968a530c973fa6ff3abe7635b8 Mon Sep 17 00:00:00 2001 From: Frank Yu Date: Tue, 26 Mar 2024 08:04:55 +0000 Subject: [PATCH 05/30] Fix wrong unit in mipi table for F10. Test: Manual test with MDS apps. The result display mipi frequency is expected. Bug: 331336468 Change-Id: I72ec2519ea345716b5430da5b8cc6a845123d399 --- .../felix_display_secondary_mipi_coex_table.csv | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/felix/radio/felix_display_secondary_mipi_coex_table.csv b/felix/radio/felix_display_secondary_mipi_coex_table.csv index e28cbcc..8394e1c 100644 --- a/felix/radio/felix_display_secondary_mipi_coex_table.csv +++ b/felix/radio/felix_display_secondary_mipi_coex_table.csv @@ -1,7 +1,7 @@ -730000,670000 +365000,335000 -1810000,1835000,670000 -720000,740000,670000 -0,710000,730000 -750000,1800000,730000 -1845000,50000000,730000 +1810000,1835000,335000 +720000,740000,335000 +0,710000,365000 +750000,1800000,365000 +1845000,50000000,365000 From f4e79e0825e6520e1d801f8b238ee87d22003341 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 28 Mar 2024 15:34:45 +0000 Subject: [PATCH 06/30] Update felix SVN to 49 Bug: 330382848 Change-Id: I4adff31a3d552c862fab43cba73c0cb074904be8 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index e6266fe..a338199 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -224,7 +224,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=48 + ro.vendor.build.svn=49 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From d33926ec064589d884cc5156e652ea9a1f1a2e81 Mon Sep 17 00:00:00 2001 From: cweichun Date: Thu, 28 Mar 2024 23:53:11 +0000 Subject: [PATCH 07/30] felix: upgrade IDisplay to V11 Bug: 307787644 Test: build pass Change-Id: Iba924e74c72d2d8f857a47068d702d4197f56ce8 --- device_framework_matrix_product_felix.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product_felix.xml b/device_framework_matrix_product_felix.xml index 90ef723..31dd4c3 100644 --- a/device_framework_matrix_product_felix.xml +++ b/device_framework_matrix_product_felix.xml @@ -1,7 +1,7 @@ com.google.hardware.pixel.display - 10 + 11 IDisplay secondary From 8bed816740b9c12ea2ea25e10ee44530578e2086 Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Thu, 14 Mar 2024 16:04:14 +0000 Subject: [PATCH 08/30] powerhint: set uclampmin_init value for applying CPU Load boost Bug: 329483662 Test: Manual Test Change-Id: I9e3afbeb455391ab1493f184bbf27f3c8e6c8e5a --- powerhint.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/powerhint.json b/powerhint.json index 34dcaed..e5d7a04 100644 --- a/powerhint.json +++ b/powerhint.json @@ -2195,7 +2195,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, @@ -2219,7 +2219,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, @@ -2243,7 +2243,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 73220aeecf69ad2c7a04be657263379aa4406b24 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 3 Apr 2024 23:17:02 +0000 Subject: [PATCH 09/30] Update felix SVN to 50 Bug: 330382848 Change-Id: Ic4cb9fec016661b45d7af9a1075e5912bd435b9e --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index a338199..dfcf0ab 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -224,7 +224,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=49 + ro.vendor.build.svn=50 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 1ab55d56bc3948f02d69ce0b2fa9c4bc1ffba22d Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Wed, 10 Apr 2024 07:10:37 +0000 Subject: [PATCH 10/30] powerhint: set ADPF CPU_LOAD_UP CPU_LOAD_RESET values Bug: 329483662 Test: Manual Test Change-Id: I9b748e2fb6110cac3d8589da2f3bb6d89a619ed3 --- powerhint.json | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/powerhint.json b/powerhint.json index e5d7a04..078beb9 100644 --- a/powerhint.json +++ b/powerhint.json @@ -2195,15 +2195,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 }, @@ -2219,15 +2219,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 }, @@ -2243,15 +2243,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 }, @@ -2274,8 +2274,6 @@ "UclampMin_High": 197, "UclampMin_Low": 197, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2298,8 +2296,6 @@ "UclampMin_High": 53, "UclampMin_Low": 53, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2322,8 +2318,6 @@ "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } From 7088cc28d6e6f26b4a68e2593641bf602c4afdd7 Mon Sep 17 00:00:00 2001 From: Barry Date: Thu, 11 Apr 2024 14:56:26 +0000 Subject: [PATCH 11/30] [Bluetooth] Disable BT auto on feature Set bluetooth.server.automatic_turn_on false for disable Bluetooth Auto On feature Bug: 333830114 Test: make Change-Id: I18365504a4f7c9f16b5b20842e15a6248770bdab --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 64d5ca6..809e753 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -150,7 +150,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Enable Bluetooth AutoOn feature PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.server.automatic_turn_on=true + bluetooth.server.automatic_turn_on=false # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ From 9f7ed821c85defdd815fbe80a293bbe76eb1184e Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 2 Apr 2024 16:47:02 +0800 Subject: [PATCH 12/30] Switch default kernel directory and change build flag naming Bug: 309749142 Change-Id: I1be08e889dfa60d6a24acac7f71f21b0241221b1 --- device-felix.mk | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/device-felix.mk b/device-felix.mk index 69ec36f..b829226 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -19,18 +19,10 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT -ifdef RELEASE_GOOGLE_FELIX_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_FELIX_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_FELIX_KERNEL_DIR +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_FELIX_VERSION) # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_FELIX_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_FELIX_KERNEL_DIR)/kernel-headers -else -TARGET_KERNEL_DIR ?= device/google/felix-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/felix-kernel/kernel-headers -endif +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_FELIX_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_FELIX_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/felix/prebuilts/device-vendor-felix.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) From 29b72d3928df54ae2772ad4131bda15f54dffcbc Mon Sep 17 00:00:00 2001 From: isaacchiou Date: Tue, 9 Apr 2024 16:02:00 +0000 Subject: [PATCH 13/30] wifi: disable FW roaming when in idle mode When device is idle, disable FW roaming (LOW RSSI roam, high band roam) to save power Bug: 321639511 Test: Manual Change-Id: Iab34c0fdda533a33d1a9f38429a809091df5dd57 --- rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index 8079614..989a868 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -175,4 +175,10 @@ If equals to 0, it means there's no limit on the max number of channels to include per network.--> 3 + + true + From 7c40f4f50be220aca06078b41c3e21725065f9c4 Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Wed, 17 Apr 2024 04:11:05 +0000 Subject: [PATCH 14/30] [USB Audio AIDL] Add mixer path for "usb-device-microphones" Bug: 329147872 Test: Local test Change-Id: Ib6794b13c755f00c2c5918f418fe1a62bbe0da98 --- audio/felix/aidl_config/mixer_paths_aidl.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/audio/felix/aidl_config/mixer_paths_aidl.xml b/audio/felix/aidl_config/mixer_paths_aidl.xml index d44e685..d71c0bf 100644 --- a/audio/felix/aidl_config/mixer_paths_aidl.xml +++ b/audio/felix/aidl_config/mixer_paths_aidl.xml @@ -1344,7 +1344,7 @@ - + @@ -1354,6 +1354,15 @@ + + + + + + + + + From dc242dcbda277a18b4bb26e6695b87a3ee21c703 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 18 Apr 2024 16:02:34 +0800 Subject: [PATCH 15/30] Switch bootloader directory to control by build flag Bug: 333834221 Change-Id: If900f24f9f171a27f81fed59c4712bf536c84734 --- device-felix.mk | 9 --------- felix/BoardConfig.mk | 12 +++--------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/device-felix.mk b/device-felix.mk index b829226..10711d0 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -262,15 +262,6 @@ PRODUCT_PACKAGES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/trunk -endif # Set zram size PRODUCT_VENDOR_PROPERTIES += \ diff --git a/felix/BoardConfig.mk b/felix/BoardConfig.mk index 9ca6580..3b54231 100644 --- a/felix/BoardConfig.mk +++ b/felix/BoardConfig.mk @@ -21,15 +21,9 @@ USES_DEVICE_GOOGLE_FELIX := true BOARD_KERNEL_CMDLINE += swiotlb=noforce RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_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_FELIX_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR)) # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true From c1da63bc66405420a7b079535f262a75c87ed35d Mon Sep 17 00:00:00 2001 From: Chris Paulo Date: Thu, 18 Apr 2024 16:23:39 -0700 Subject: [PATCH 16/30] felix/vibrator: Add removecapo flag reference for it to show up in aconfig Bug: 335547922 Test: adb shell device_config list | egrep -i 'remove_capo' Change-Id: I1f6dca0f0dc61fa4bc2db85a1fc55f56ce7146af Signed-off-by: Chris Paulo --- vibrator/cs40l26/Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/vibrator/cs40l26/Android.bp b/vibrator/cs40l26/Android.bp index 9ac51d1..bd5047a 100644 --- a/vibrator/cs40l26/Android.bp +++ b/vibrator/cs40l26/Android.bp @@ -60,6 +60,7 @@ cc_library { srcs: [ "Vibrator.cpp", ], + shared_libs: ["//hardware/google/pixel:PixelVibratorFlagsL26"], export_include_dirs: ["."], vendor_available: true, visibility: [":__subpackages__"], From b830ea62b3a8f210b05c9d366fc0b94cf5c68a28 Mon Sep 17 00:00:00 2001 From: Cutter Coryell Date: Mon, 1 Apr 2024 12:08:29 -0700 Subject: [PATCH 17/30] Turn off ML in system back gesture Bug: b/332343111 Fixes: b/332343111 Test: atest BackAnimationControllerTest BackNavigationControllerTests OnBackInvokedDispatcherTest Change-Id: I3de429ed6d9972355dae4edd2fd03b15859d0f4b --- .../frameworks/base/packages/SystemUI/res/values/config.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/felix/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/felix/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index 9d91e32..5a97b1d 100644 --- a/felix/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/felix/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -148,5 +148,8 @@ 4 : DEVICE_POSTURE_FLIPPED --> 1 + + + false From e222c307125a3c038eb3c5376453c70d9c47040c Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 24 Apr 2024 19:47:53 +0000 Subject: [PATCH 18/30] Update felix SVN to 51 Bug: 336526332 Change-Id: I0b4bea1a97004139cc18129eeeab302aa557ca05 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index dfcf0ab..1b69924 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -224,7 +224,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=50 + ro.vendor.build.svn=51 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 499a0fb8e03892d031e2f721ff69890adbe49f4b Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 25 Apr 2024 03:46:07 +0000 Subject: [PATCH 19/30] Update felix SVN to 52 Bug: 336526332 Change-Id: I29b92d74abee7982022151fb53ef23634fd707f8 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 1b69924..94a95d5 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -224,7 +224,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=51 + ro.vendor.build.svn=52 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From b1c645d05f31bfdaf29ae598ad4903a65675a47e Mon Sep 17 00:00:00 2001 From: Thomas Girardier Date: Thu, 25 Apr 2024 16:21:17 +0000 Subject: [PATCH 20/30] Revert "[Bluetooth] Disable BT auto on feature" Revert submission 26919210-BTAUTOOFF4389 Reason for revert: Auto On has been approved for 24Q3 Reverted changes: /q/submissionid:26919210-BTAUTOOFF4389 Change-Id: I6954cbe2e9dcbed7ee450b73fceb3025e149d349 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 809e753..64d5ca6 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -150,7 +150,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Enable Bluetooth AutoOn feature PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.server.automatic_turn_on=false + bluetooth.server.automatic_turn_on=true # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ From 4ce0287a438168b5ac7c64f016245a02732238c0 Mon Sep 17 00:00:00 2001 From: Hao Dong Date: Wed, 24 Apr 2024 05:27:26 +0000 Subject: [PATCH 21/30] Rename style from AuthCredential to AuthNonBioCredential. Bug: 335199602 Test: N/A Change-Id: Ief716415b2dbe330e69835a31f323a012a39af1c --- .../base/packages/SystemUI/res/values-sw600dp-land/styles.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/felix/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp-land/styles.xml b/felix/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp-land/styles.xml index b104587..b14ff4f 100644 --- a/felix/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp-land/styles.xml +++ b/felix/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp-land/styles.xml @@ -16,7 +16,7 @@ -