From 978853810095aa32f17c0b9d7fe8e15d8e8bd8a2 Mon Sep 17 00:00:00 2001 From: Nathan Kulczak Date: Wed, 11 Sep 2024 00:44:30 +0000 Subject: [PATCH 01/10] Vibrator: Add permissions for owt_lib_compat Add permissions to access owt_lib_compat sysfs attribute Bug: 346570576 Flag: vendor.vibrator.hal.flags.enable_pwle_v2 Test: Flash to device and use access sysfs Change-Id: Ic86d17458f0c97b1a1a91fbfcf718fc8d4d6d7ba Signed-off-by: Nathan Kulczak --- conf/init.pantah.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index a404bb5..1603ef6 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -88,6 +88,7 @@ on property:vendor.all.modules.ready=1 chown system system /sys/bus/i2c/devices/8-0043/default/braking_time_ms chown system system /sys/bus/i2c/devices/8-0043/default/f0_offset chown system system /sys/bus/i2c/devices/8-0043/default/owt_free_space + chown system system /sys/bus/i2c/devices/8-0043/default/owt_lib_compat chown system system /sys/bus/i2c/devices/8-0043/default/f0_comp_enable chown system system /sys/bus/i2c/devices/8-0043/default/redc_comp_enable chown system system /sys/bus/i2c/devices/8-0043/default/delay_before_stop_playback_us From 640c3160c9b39d6b7d986fbc325bcb4fde049044 Mon Sep 17 00:00:00 2001 From: Tommy Chang Date: Fri, 27 Dec 2024 10:37:20 +0000 Subject: [PATCH 02/10] Disable Bluetooth Hearing Access Profile default enable for P22 Set bluetooth.profile.hap.enabled_by_default to false bug: 386323913 Test: m Flag: EXEMPT, properties change only for feature config Change-Id: I1f7898f9fedefff9b64cbb51b5fbb177b87d57e4 --- device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 67dde2d..30a8fc4 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -246,6 +246,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630 +# Disable Bluetooth HAP by default +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.profile.hap.enabled_by_default=false + # Support LE & Classic concurrent encryption (b/330704060) PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.ble.allow_enc_with_bredr=true diff --git a/device-panther.mk b/device-panther.mk index d4e660b..e10429a 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -216,6 +216,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630 +# Disable Bluetooth HAP by default +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.profile.hap.enabled_by_default=false + # Support LE & Classic concurrent encryption (b/330704060) PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.ble.allow_enc_with_bredr=true From 769b5b1177e0d79040e0e0c6d68d79621211b853 Mon Sep 17 00:00:00 2001 From: samou Date: Mon, 13 Jan 2025 08:19:14 +0000 Subject: [PATCH 03/10] thermal: Remove bcl related tzones Flag: EXEMPT tuning changes Test: Confirm boot Bug: 389568268 Change-Id: I83d55df0e8065ab9ef10348e5fbbdf2a48cacb6a Signed-off-by: samou --- thermal_info_config_proto.json | 431 --------------------------------- 1 file changed, 431 deletions(-) diff --git a/thermal_info_config_proto.json b/thermal_info_config_proto.json index a35fca2..71f467d 100644 --- a/thermal_info_config_proto.json +++ b/thermal_info_config_proto.json @@ -60,81 +60,6 @@ "VrThreshold":"NAN", "Multiplier":0.001 }, - { - "Name":"battery_cycle", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":false - }, - { - "Name":"critical-battery-cell", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"FLASH_LED_REDUCE", - "Type":"UNKNOWN", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "SendPowerHint":true - }, { "Name":"soc", "Type":"BCL_PERCENTAGE", @@ -159,45 +84,6 @@ } ] }, - { - "Name":"batoilo", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 5000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 10, 11, 11] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, { "Name":"BCL_AUDIO_BAACL", "Type":"BCL_VOLTAGE", @@ -225,323 +111,6 @@ "Multiplier":1, "Monitor":true }, - { - "Name":"vdroop1", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "Name":"vdroop2", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1200, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 15, 15, 15] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "Name":"smpl_gm", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1100, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 13, 13, 13] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "Name":"ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"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 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 10500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"ocp_gpu", - "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 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"soft_ocp_cpu2", - "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 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"soft_ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "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 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":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 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, { "Name":"TPU", "Type":"NPU", From a038d3df73ddddf52a4300a17e193523c1970a32 Mon Sep 17 00:00:00 2001 From: Isaac Chiou Date: Wed, 6 Nov 2024 09:27:04 +0000 Subject: [PATCH 04/10] Enable open source multi akm for specific Broadcom project For cross akm roaming function, we have two ways in supplicant : 1. Open source way. 2. Broadcom specific way. Originally, Broadcom projects follow way 2 due to the limitation of the driver. For now, we plan to move all Broadcom projects to follow way 1 to make supplicant code clean and downsteam without conflict. For those projects which is ready for way 1, we control it to follow way 1 with WIFI_BRCM_OPEN_SOURCE_MULTI_AKM config. For the rest of Broadcom projects, we still follow way 2 until the multiple AKMs is fully supported by driver and verified. For ongoing Broadcom project, we also need to exercise the open source path in supplicant to do multiple AKM configuration to comply with WFA Wifi 7 AKM24 specification (b/331896542 ). Bug: 246871098 Test: AU drop test Test: Cross AKM roaming test Flag: EXEMPT enable control flag for aosp akms Change-Id: I57fadcc164b23d6bdb85a0909d23dfa32fc71b12 --- wifi/BoardConfig-wifi.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index 14f9821..f2bf58d 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -31,6 +31,7 @@ WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_FEATURE_HOSTAPD_11AX := true BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true +WIFI_BRCM_OPEN_SOURCE_MULTI_AKM := enabled PRODUCT_COPY_FILES += \ device/google/pantah/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ From ff6d0e8c9eaf211e0969ee36451b2720f5d875d6 Mon Sep 17 00:00:00 2001 From: Paulsu Su Date: Wed, 15 Jan 2025 00:41:23 -0800 Subject: [PATCH 05/10] powerhint: Mask hints in AA and DISPLAY_IDLE This CL adds a powerhint for AA mode to mask storming hint. DISPLAY_IDLE masks DISPLAY_UPDATE_IMMINENT and CPU_LOAD_RESET when Android Auto property is set. When navigation in Android Auto, the two hint with action to boost memlat is costly. Bug: 380188115 Change-Id: I825a56ac32a0ecdc8b441af9cb64e81b1d04f9a6 Test: Local test with desktop_head_unit_internal Flag: EXEMPT powerhint change --- powerhint-cheetah.json | 28 ++++++++++++++++++++++++++++ powerhint-panther.json | 28 ++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 802422b..e319f85 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -686,6 +686,16 @@ ], "DefaultIndex": 0, "ResetOnInit": true + }, + { + "Name": "AAModeProperty", + "Path": "vendor.powerhal.mode.aa", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true, + "Type": "Property" } ], "Actions": [ @@ -1989,6 +1999,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "AUTOMOTIVE_PROJECTION", + "Node": "AAModeProperty", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -2006,6 +2022,18 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "MaskHint", + "Value":"DISPLAY_UPDATE_IMMINENT", + "EnableProperty": "vendor.powerhal.mode.aa" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "MaskHint", + "Value":"CPU_LOAD_RESET", + "EnableProperty": "vendor.powerhal.mode.aa" + }, { "PowerHint": "DISPLAY_UPDATE_IMMINENT", "Node": "DisplayWakeup", diff --git a/powerhint-panther.json b/powerhint-panther.json index cb203c4..c10009a 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -666,6 +666,16 @@ ], "DefaultIndex": 0, "ResetOnInit": true + }, + { + "Name": "AAModeProperty", + "Path": "vendor.powerhal.mode.aa", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true, + "Type": "Property" } ], "Actions": [ @@ -1845,6 +1855,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "AUTOMOTIVE_PROJECTION", + "Node": "AAModeProperty", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -1862,6 +1878,18 @@ "Type": "EndHint", "Value": "DISPLAY_UPDATE_IMMINENT" }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "MaskHint", + "Value":"DISPLAY_UPDATE_IMMINENT", + "EnableProperty": "vendor.powerhal.mode.aa" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "MaskHint", + "Value":"CPU_LOAD_RESET", + "EnableProperty": "vendor.powerhal.mode.aa" + }, { "PowerHint": "DISPLAY_UPDATE_IMMINENT", "Node": "DisplayWakeup", From 4bc66f68e20fd8487a0e542c3033f455de4b8012 Mon Sep 17 00:00:00 2001 From: Angela Wang Date: Wed, 15 Jan 2025 09:11:58 +0000 Subject: [PATCH 06/10] Hide LE audio toggle for ASHA device on P22 Set bluetooth.leaudio.toggle_for_asha to false Flag: EXEMPT properties change only Bug: 390070780 Test: m Change-Id: I5bd83a67dc6d31476d9de2565b73c4208a20b372 --- device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 30a8fc4..3f01fba 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -250,6 +250,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.hap.enabled_by_default=false +# Disable Bluetooth LE Audio toggle for ASHA device +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.leaudio.toggle_visible_for_asha=false + # Support LE & Classic concurrent encryption (b/330704060) PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.ble.allow_enc_with_bredr=true diff --git a/device-panther.mk b/device-panther.mk index e10429a..987433d 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -220,6 +220,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.hap.enabled_by_default=false +# Disable Bluetooth LE Audio toggle for ASHA device +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.leaudio.toggle_visible_for_asha=false + # Support LE & Classic concurrent encryption (b/330704060) PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.ble.allow_enc_with_bredr=true From e3834b85649cfca96b93010496ccf7c0365b87b2 Mon Sep 17 00:00:00 2001 From: guibing Date: Mon, 3 Feb 2025 19:04:19 +0000 Subject: [PATCH 07/10] ADPF:pantah: remove unused adpf profiles. Bug: 393196667 Test: adb shell dumpsys android.hardware.power.IPower/default Flag: NONE powerhal doesn't have a flag yet Change-Id: I7b90d90300491fd8ca4cbda9c784a6a03c05ef32 --- powerhint-cheetah.json | 72 ------------------------------------------ powerhint-panther.json | 72 ------------------------------------------ 2 files changed, 144 deletions(-) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index e319f85..64609ba 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -2401,78 +2401,6 @@ "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 - }, - { - "Name": "UiHighBoostWithoutPid", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 197, - "UclampMin_Low": 197, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 - }, - { - "Name": "UiLowBoostWithoutPid", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 53, - "UclampMin_Low": 53, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 - }, - { - "Name": "UiLowNoneBoost", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 0, - "UclampMin_Low": 0, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 } ] } diff --git a/powerhint-panther.json b/powerhint-panther.json index c10009a..ce6e89f 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -2257,78 +2257,6 @@ "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 - }, - { - "Name": "UiHighBoostWithoutPid", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 197, - "UclampMin_Low": 197, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 - }, - { - "Name": "UiLowBoostWithoutPid", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 53, - "UclampMin_Low": 53, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 - }, - { - "Name": "UiLowNoneBoost", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 0, - "UclampMin_Low": 0, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0 } ] } From 828326837bfe4de9803ad15a899fea472ed9d334 Mon Sep 17 00:00:00 2001 From: guibing Date: Mon, 3 Feb 2025 19:16:11 +0000 Subject: [PATCH 08/10] ADPF:pantah: use tagged ADPF profile for SYSTEM_UI. - Add a event node for SYSTEM_UI; - Add a separate SYSTEM_UI profile. Bug: 393196667 Test: adb shell dumpsys android.hardware.power.IPower/default Flag: NONE powerhal doesn't have a flag yet Change-Id: I21b94cbe664728935d40976942861c3255054866 --- powerhint-cheetah.json | 46 ++++++++++++++++++++++++++++++++++++++++++ powerhint-panther.json | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 64609ba..d8c776b 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -696,6 +696,16 @@ ], "ResetOnInit": true, "Type": "Property" + }, + { + "Name": "SYSTEM_UI_ADPF_PROFILES", + "Path": ":SYSTEM_UI", + "Values": [ + "SYSTEM_UI_PROFILE" + ], + "DefaultIndex": 0, + "ResetOnInit": true, + "Type": "Event" } ], "Actions": [ @@ -2401,6 +2411,42 @@ "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 + }, + { + "Name": "SYSTEM_UI_PROFILE", + "PID_On": true, + "PID_Po": 2.0, + "PID_Pu": 1.0, + "PID_I": 0.0, + "PID_I_Init": 200, + "PID_I_High": 512, + "PID_I_Low": -30, + "PID_Do": 500.0, + "PID_Du": 0.0, + "UclampMin_On": true, + "UclampMin_Init": 232, + "UclampMin_LoadUp": 730, + "UclampMin_LoadReset": 730, + "UclampMin_High": 480, + "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, + "SamplingWindow_P": 1, + "SamplingWindow_I": 0, + "SamplingWindow_D": 1, + "ReportingRateLimitNs": 166666660, + "TargetTimeFactor": 1.0, + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 } ] } diff --git a/powerhint-panther.json b/powerhint-panther.json index ce6e89f..63740c5 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -676,6 +676,16 @@ ], "ResetOnInit": true, "Type": "Property" + }, + { + "Name": "SYSTEM_UI_ADPF_PROFILES", + "Path": ":SYSTEM_UI", + "Values": [ + "SYSTEM_UI_PROFILE" + ], + "DefaultIndex": 0, + "ResetOnInit": true, + "Type": "Event" } ], "Actions": [ @@ -2257,6 +2267,42 @@ "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 + }, + { + "Name": "SYSTEM_UI_PROFILE", + "PID_On": true, + "PID_Po": 2.0, + "PID_Pu": 1.0, + "PID_I": 0.0, + "PID_I_Init": 200, + "PID_I_High": 512, + "PID_I_Low": -30, + "PID_Do": 500.0, + "PID_Du": 0.0, + "UclampMin_On": true, + "UclampMin_Init": 232, + "UclampMin_LoadUp": 730, + "UclampMin_LoadReset": 730, + "UclampMin_High": 480, + "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, + "SamplingWindow_P": 1, + "SamplingWindow_I": 0, + "SamplingWindow_D": 1, + "ReportingRateLimitNs": 166666660, + "TargetTimeFactor": 1.0, + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 } ] } From cb3fc7c93ce7697a7cbcc1aa8313fe5b21b4211e Mon Sep 17 00:00:00 2001 From: Barry Date: Fri, 31 Jan 2025 06:47:53 +0000 Subject: [PATCH 09/10] Enable BQR vendor snoop log Enable BQR vendor snoop log and enable enable Vendor Specific Quality event(s) Bug: 393493640 Test: Manual Test Flag: EXEMPT system prop update Change-Id: I260cedd9b4af909427292e38503c04c47f98fe9c --- bluetooth/bt_vendor_overlay.conf | 2 +- device-cheetah.mk | 10 ++++++++-- device-panther.mk | 10 ++++++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index 0b1c80f..99e48fb 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -7,7 +7,7 @@ UartPort = /dev/ttySAC18 SarBackOffHighResolution = true # Update BQR Event Mask property value -BqrEventMaskValueUpdate = 262238 +BqrEventMaskValueUpdate = 295006 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus diff --git a/device-cheetah.mk b/device-cheetah.mk index 3f01fba..740b991 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -210,10 +210,16 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Override BQR mask to enable LE Audio Choppy report, remove BTRT logging ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=262238 + persist.bluetooth.bqr.event_mask=295006 \ + persist.bluetooth.bqr.vnd_quality_mask=29 \ + persist.bluetooth.bqr.vnd_trace_mask=0 \ + persist.bluetooth.vendor.btsnoop=true else PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=94 + persist.bluetooth.bqr.event_mask=295006 \ + persist.bluetooth.bqr.vnd_quality_mask=16 \ + persist.bluetooth.bqr.vnd_trace_mask=0 \ + persist.bluetooth.vendor.btsnoop=false endif # Bluetooth LE Audio diff --git a/device-panther.mk b/device-panther.mk index 987433d..f7dc258 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -242,10 +242,16 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Override BQR mask to enable LE Audio Choppy report, remove BTRT logging ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=262238 + persist.bluetooth.bqr.event_mask=295006 \ + persist.bluetooth.bqr.vnd_quality_mask=29 \ + persist.bluetooth.bqr.vnd_trace_mask=0 \ + persist.bluetooth.vendor.btsnoop=true else PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=94 + persist.bluetooth.bqr.event_mask=295006 \ + persist.bluetooth.bqr.vnd_quality_mask=16 \ + persist.bluetooth.bqr.vnd_trace_mask=0 \ + persist.bluetooth.vendor.btsnoop=false endif # declare use of spatial audio From 57138c70b5d3e2a963e86bb1ef5e28d6db65d2c2 Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Wed, 5 Feb 2025 21:44:35 +0000 Subject: [PATCH 10/10] Remove old unused VINTF manifest file This file is out of date and unused, so remove it. It's targeting Android R FCM and declaring old HIDL versions of HALs that these devices do not use. Test: m Bug: 388074589 Change-Id: I68d1254031455d020cbb813021c63ea54e38689b --- aosp_cheetah.mk | 3 -- aosp_cloudripper.mk | 3 -- aosp_panther.mk | 3 -- aosp_ravenclaw.mk | 3 -- manifest.xml | 116 -------------------------------------------- 5 files changed, 128 deletions(-) delete mode 100644 manifest.xml diff --git a/aosp_cheetah.mk b/aosp_cheetah.mk index 8f44682..ffdb739 100644 --- a/aosp_cheetah.mk +++ b/aosp_cheetah.mk @@ -28,7 +28,4 @@ PRODUCT_MODEL := AOSP on Cheetah PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google -DEVICE_MANIFEST_FILE := \ - device/google/pantah/manifest.xml - PRODUCT_PACKAGES += com.android.vndk.current.on_vendor diff --git a/aosp_cloudripper.mk b/aosp_cloudripper.mk index ba4a156..59b5dcd 100644 --- a/aosp_cloudripper.mk +++ b/aosp_cloudripper.mk @@ -27,6 +27,3 @@ PRODUCT_DEVICE := cloudripper PRODUCT_MODEL := AOSP on cloudripper PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google - -DEVICE_MANIFEST_FILE := \ - device/google/pantah/manifest.xml diff --git a/aosp_panther.mk b/aosp_panther.mk index 36a4cb1..0cc3d6e 100644 --- a/aosp_panther.mk +++ b/aosp_panther.mk @@ -28,7 +28,4 @@ PRODUCT_MODEL := AOSP on Panther PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google -DEVICE_MANIFEST_FILE := \ - device/google/pantah/manifest.xml - PRODUCT_PACKAGES += com.android.vndk.current.on_vendor diff --git a/aosp_ravenclaw.mk b/aosp_ravenclaw.mk index 55e1ce9..ffafd5b 100644 --- a/aosp_ravenclaw.mk +++ b/aosp_ravenclaw.mk @@ -28,6 +28,3 @@ PRODUCT_DEVICE := ravenclaw PRODUCT_MODEL := AOSP on Ravenclaw PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google - -DEVICE_MANIFEST_FILE := \ - device/google/pantah/manifest.xml diff --git a/manifest.xml b/manifest.xml deleted file mode 100644 index 18109c6..0000000 --- a/manifest.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - android.hardware.audio - hwbinder - 7.1 - - IDevicesFactory - default - - - - android.hardware.audio.effect - hwbinder - 7.0 - - IEffectsFactory - default - - - - android.hardware.soundtrigger - hwbinder - 2.3 - - ISoundTriggerHw - default - - - - android.hardware.media.omx - hwbinder - 1.0 - - IOmx - default - - - IOmxStore - default - - - - android.hardware.graphics.allocator - hwbinder - 4.0 - - IAllocator - default - - - - android.hardware.graphics.composer - hwbinder - 2.4 - - IComposer - default - - - - android.hardware.renderscript - passthrough - 1.0 - - IDevice - default - - - - android.hardware.dumpstate - hwbinder - 1.1 - - IDumpstateDevice - default - - - - android.hardware.bluetooth.audio - hwbinder - 2.1 - - IBluetoothAudioProvidersFactory - default - - - - android.hardware.boot - hwbinder - @1.2::IBootControl/default - - - android.hardware.neuralnetworks - hwbinder - @1.3::IDevice/google-edgetpu - - - android.hardware.health - hwbinder - 2.1 - - IHealth - default - - - - vendor.google.whitechapel.audio.audioext - hwbinder - 4.0 - - IAudioExt - default - - - -