From f9be9f16f3eee3bf39852858e33d39123875ffc3 Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Thu, 29 Feb 2024 13:27:50 +0000 Subject: [PATCH 01/31] dumpstate: touch: Init using touch_predump More info at go/touch_predump Test: Test locally on test device and check predump_touch works. Bug: 287907308 Change-Id: I7fac888394db29819f2fcb5641d721d016acd7aa --- device-husky.mk | 4 ++-- device-shiba.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 7b97192..17ac8b4 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -67,8 +67,8 @@ include device/google/shusky/audio/husky/audio-tables.mk include device/google/zuma/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -include device/google/gs-common/touch/stm/stm20.mk -include device/google/gs-common/touch/gti/gti.mk +include device/google/gs-common/touch/stm/predump_stm20.mk +include device/google/gs-common/touch/gti/predump_gti.mk include device/google/gs-common/touch/touchinspector/touchinspector.mk # Init files diff --git a/device-shiba.mk b/device-shiba.mk index 9a3ba7b..197f9b9 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -50,7 +50,7 @@ include device/google/shusky/audio/shiba/audio-tables.mk include device/google/zuma/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -include device/google/gs-common/touch/gti/gti.mk +include device/google/gs-common/touch/gti/predump_gti.mk # Init files PRODUCT_COPY_FILES += \ From d5729b0d0a9e2072a4a69e4a056b347e5bd5c20f Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Fri, 2 Aug 2024 18:20:22 +0000 Subject: [PATCH 02/31] [shusky] Define CAMERA_MULTICAM_BOOST Port from ag/28607900 This CL defines CAMERA_MULTICAM_BOOST (with the same settings as the existing CAMERA_ZOOMING_BOOST). Having both definitions is necessary to be able to transition from zooming boost to multicam boost. Once the multicam boost flag is fully rolled out, we can remove the CAMERA_ZOOMING_BOOST. Bug: 347829135 Test: adb logcat Flag: EXEMPT resource file only change Change-Id: I66f82dec5733a147ecbf073beb5b6c36f4860bb4 --- perf/powerhint-husky.json | 18 ++++++++++++++++++ perf/powerhint-ripcurrent.json | 18 ++++++++++++++++++ perf/powerhint-shiba.json | 18 ++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index fd71402..a1a1f53 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -1529,6 +1529,24 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "AutoPreferIdle", + "Duration": 100, + "Value": "0" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index e91061c..e073b6a 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -1487,6 +1487,24 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "AutoPreferIdle", + "Duration": 100, + "Value": "0" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "Node": "TAPreferHighCap", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 2a45ff0..350b2f3 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -1535,6 +1535,24 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "AutoPreferIdle", + "Duration": 100, + "Value": "0" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "Node": "TAPreferHighCap", From 2b1c4305179d1c4a3e4625c6152566b9354481b1 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Mon, 16 Sep 2024 15:02:52 +0000 Subject: [PATCH 03/31] Use auto prefer fit for launch Enable auto prefer fit for high prio tasks when app launch, and tune uclmap min settings for different task prio. Bug: 353885521 Flag: NONE powerhint change does not support flags Test: build pass Change-Id: I1b65a1543085dc3244a36d90c01ccb3ad9211604 --- perf/powerhint-husky.json | 102 +++++++++++++++++++++++++++++---- perf/powerhint-ripcurrent.json | 102 +++++++++++++++++++++++++++++---- perf/powerhint-shiba.json | 102 +++++++++++++++++++++++++++++---- 3 files changed, 270 insertions(+), 36 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 64fa155..f1f31c1 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -320,6 +320,51 @@ ], "ResetOnInit": true }, + { + "Name": "TAUclampMinOnNiceEnable", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceHighValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value", + "Values": [ + "765", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceMidValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value", + "Values": [ + "570", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceHighPrio", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio", + "Values": [ + "110", + "120" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceMidPrio", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio", + "Values": [ + "139", + "130" + ], + "ResetOnInit": true + }, { "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/groups/fg/uclamp_min", @@ -428,6 +473,15 @@ ], "ResetOnInit": true }, + { + "Name": "TAAutoPreferFit", + "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAPreferredIdleMaskHigh", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", @@ -860,12 +914,6 @@ "Duration": 5000, "Value": "0x1ff" }, - { - "PowerHint": "LAUNCH", - "Node": "TAPreferredIdleMaskMid", - "Duration": 5000, - "Value": "0x1ff" - }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -925,12 +973,6 @@ "Duration": 5000, "Value": "615" }, - { - "PowerHint": "LAUNCH", - "Node": "TAUClampBoost", - "Duration": 5000, - "Value": "765" - }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1001,6 +1043,42 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TAAutoPreferFit", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceEnable", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighValue", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighPrio", + "Duration": 5000, + "Value": "110" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidValue", + "Duration": 5000, + "Value": "570" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidPrio", + "Duration": 5000, + "Value": "139" + }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 7a34efb..66240a7 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -315,6 +315,51 @@ ], "ResetOnInit": true }, + { + "Name": "TAUclampMinOnNiceEnable", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceHighValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value", + "Values": [ + "765", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceMidValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value", + "Values": [ + "570", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceHighPrio", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio", + "Values": [ + "110", + "120" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceMidPrio", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio", + "Values": [ + "139", + "130" + ], + "ResetOnInit": true + }, { "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/groups/fg/uclamp_min", @@ -423,6 +468,15 @@ ], "ResetOnInit": true }, + { + "Name": "TAAutoPreferFit", + "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAPreferredIdleMaskHigh", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", @@ -891,12 +945,6 @@ "Duration": 5000, "Value": "0x1ff" }, - { - "PowerHint": "LAUNCH", - "Node": "TAPreferredIdleMaskMid", - "Duration": 5000, - "Value": "0x1ff" - }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -956,12 +1004,6 @@ "Duration": 5000, "Value": "615" }, - { - "PowerHint": "LAUNCH", - "Node": "TAUClampBoost", - "Duration": 5000, - "Value": "765" - }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1032,6 +1074,42 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TAAutoPreferFit", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceEnable", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighValue", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighPrio", + "Duration": 5000, + "Value": "110" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidValue", + "Duration": 5000, + "Value": "570" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidPrio", + "Duration": 5000, + "Value": "139" + }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index bccce89..f4b465a 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -321,6 +321,51 @@ ], "ResetOnInit": true }, + { + "Name": "TAUclampMinOnNiceEnable", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceHighValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value", + "Values": [ + "765", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceMidValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value", + "Values": [ + "570", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceHighPrio", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio", + "Values": [ + "110", + "120" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceMidPrio", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio", + "Values": [ + "139", + "130" + ], + "ResetOnInit": true + }, { "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/groups/fg/uclamp_min", @@ -429,6 +474,15 @@ ], "ResetOnInit": true }, + { + "Name": "TAAutoPreferFit", + "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAPreferredIdleMaskHigh", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", @@ -861,12 +915,6 @@ "Duration": 5000, "Value": "0x1ff" }, - { - "PowerHint": "LAUNCH", - "Node": "TAPreferredIdleMaskMid", - "Duration": 5000, - "Value": "0x1ff" - }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -926,12 +974,6 @@ "Duration": 5000, "Value": "615" }, - { - "PowerHint": "LAUNCH", - "Node": "TAUClampBoost", - "Duration": 5000, - "Value": "765" - }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1002,6 +1044,42 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TAAutoPreferFit", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceEnable", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighValue", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighPrio", + "Duration": 5000, + "Value": "110" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidValue", + "Duration": 5000, + "Value": "570" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidPrio", + "Duration": 5000, + "Value": "139" + }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", From f3fe769cac6e016b54c68a4afaf6be94c6438f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20Ko=C5=82odziejczyk?= Date: Tue, 16 Jul 2024 12:10:11 +0000 Subject: [PATCH 04/31] audio: enable software encoded Bluetooth broadcast Bug: 345372436 Test: manual Flag: EXEMPT, trivial change Change-Id: Ibf998bd3194bb704dfa50e876f449687040f2c8c --- .../bluetooth_with_le_audio_policy_configuration_7_0.xml | 6 +++++- .../bluetooth_with_le_audio_policy_configuration_7_0.xml | 6 +++++- .../bluetooth_with_le_audio_policy_configuration_7_0.xml | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..efd7277 100644 --- a/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + \ No newline at end of file diff --git a/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..efd7277 100644 --- a/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + \ No newline at end of file diff --git a/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..efd7277 100644 --- a/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + \ No newline at end of file From 2609a6df397dc465b8f0cd5216436cfa758a62ef Mon Sep 17 00:00:00 2001 From: David Chao Date: Fri, 20 Sep 2024 09:44:50 +0000 Subject: [PATCH 05/31] thermal: remove duplicate counting power rail L22M_DISP ODPM rail is LDO downstream from S6M_LLDO1, Remove L22M_DISP from PARTIAL_SYSTEM_POWER to avoid the duplicate counting. Flag: EXEMPT config update Bug: 364666080 Test: boot to home and thermal throttling worked properly Change-Id: Ia06dd36ccfba3219b1e4af404c011b00ee36ed5a --- thermal/thermal_info_config_charge_husky.json | 4 ++-- thermal/thermal_info_config_charge_shiba.json | 4 ++-- thermal/thermal_info_config_husky.json | 4 ++-- thermal/thermal_info_config_shiba.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json index 66b949d..bff051d 100644 --- a/thermal/thermal_info_config_charge_husky.json +++ b/thermal/thermal_info_config_charge_husky.json @@ -329,8 +329,8 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 } diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json index 25fa05d..ee18d02 100644 --- a/thermal/thermal_info_config_charge_shiba.json +++ b/thermal/thermal_info_config_charge_shiba.json @@ -362,8 +362,8 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 } diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 29c24cd..6a94d17 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -1051,8 +1051,8 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 } diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 82c6fbc..d1485a7 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -1084,8 +1084,8 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 } From 11aaff62994134eda4f1329d1787a066418cdbcf Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 19 Sep 2024 23:12:44 +0800 Subject: [PATCH 06/31] gps: set default SUPL SSL method to SSLv23 Bug: 363886476 Test: verify SUPL NI test pass Change-Id: Ic19ff6af1a86f94853e8d2c65012ee247ae25bde --- location/gps.6.1.xml.hk3 | 2 +- location/gps.6.1.xml.sb3 | 2 +- location/gps.xml | 2 +- location/gps.xml.hk3 | 2 +- location/gps.xml.sb3 | 2 +- location/gps_user.6.1.xml.hk3 | 2 +- location/gps_user.6.1.xml.sb3 | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.hk3 | 2 +- location/gps_user.xml.sb3 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/location/gps.6.1.xml.hk3 b/location/gps.6.1.xml.hk3 index b4a758f..a0f4913 100644 --- a/location/gps.6.1.xml.hk3 +++ b/location/gps.6.1.xml.hk3 @@ -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/location/gps.6.1.xml.sb3 b/location/gps.6.1.xml.sb3 index 7e83262..5a7b48e 100644 --- a/location/gps.6.1.xml.sb3 +++ b/location/gps.6.1.xml.sb3 @@ -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/location/gps.xml b/location/gps.xml index 13d54d3..4be8675 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -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/location/gps.xml.hk3 b/location/gps.xml.hk3 index 6421033..9774534 100644 --- a/location/gps.xml.hk3 +++ b/location/gps.xml.hk3 @@ -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/location/gps.xml.sb3 b/location/gps.xml.sb3 index d29bf7e..a31af5d 100644 --- a/location/gps.xml.sb3 +++ b/location/gps.xml.sb3 @@ -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/location/gps_user.6.1.xml.hk3 b/location/gps_user.6.1.xml.hk3 index 34a3b23..b27f598 100644 --- a/location/gps_user.6.1.xml.hk3 +++ b/location/gps_user.6.1.xml.hk3 @@ -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/location/gps_user.6.1.xml.sb3 b/location/gps_user.6.1.xml.sb3 index 4ae0f73..e715f27 100644 --- a/location/gps_user.6.1.xml.sb3 +++ b/location/gps_user.6.1.xml.sb3 @@ -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/location/gps_user.xml b/location/gps_user.xml index 97f881e..215973a 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -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/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3 index 2451057..e1fb9b9 100644 --- a/location/gps_user.xml.hk3 +++ b/location/gps_user.xml.hk3 @@ -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/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3 index 7968386..28bfb94 100644 --- a/location/gps_user.xml.sb3 +++ b/location/gps_user.xml.sb3 @@ -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 7ebc41a8d797f92675343176089f070673d4735f Mon Sep 17 00:00:00 2001 From: Akshay Cadambi Date: Fri, 27 Sep 2024 03:09:58 +0000 Subject: [PATCH 07/31] Disable stereo spatialization. Bug: 365846274 Flag: com.android.media.audio.stereo_spatialization Change-Id: Ifea4fe80c88fa522349dc6fed11a05a7244730d6 --- device-husky.mk | 4 ---- device-shiba.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 566ea2b..7c525c6 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -145,10 +145,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ ifeq ($(USE_AUDIO_HAL_AIDL),true) # AIDL -# declare use of stereo spatialization -PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.stereo_spatialization_enabled=true - else # HIDL diff --git a/device-shiba.mk b/device-shiba.mk index 5cd1c6f..7d9f47e 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -133,10 +133,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ ifeq ($(USE_AUDIO_HAL_AIDL),true) # AIDL -# declare use of stereo spatialization -PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.stereo_spatialization_enabled=true - else # HIDL From 54e593d3e72025eaafb78924b3c362315ae3a75c Mon Sep 17 00:00:00 2001 From: Vilas Bhat Date: Mon, 30 Sep 2024 16:28:07 +0000 Subject: [PATCH 08/31] 16k: Switch AOSP shusky 16k targets to use ext4 for RW filesystem TARGET_RW_FILE_SYSTEM_TYPE is used to decide the fstab configuration to use for RW files. It must be set to ext4 for targets that boot with 16k page size kernels. Test: $ get_build_var TARGET_RW_FILE_SYSTEM_TYPE ext4 Also built & booted the targets successfully (on internal branch) Bug: 358213765 Change-Id: Ia4e36e5a5e10ff10e4d43c1089f8a98a3ac601b5 Flag: EXEMPT bugfix --- aosp_husky_pgagnostic.mk | 1 + aosp_shiba_pgagnostic.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk index f633834..50a3f3f 100644 --- a/aosp_husky_pgagnostic.mk +++ b/aosp_husky_pgagnostic.mk @@ -22,4 +22,5 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_RW_FILE_SYSTEM_TYPE := ext4 TARGET_BOOTS_16K := true diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk index 0b23ed5..208ee17 100644 --- a/aosp_shiba_pgagnostic.mk +++ b/aosp_shiba_pgagnostic.mk @@ -22,4 +22,5 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_RW_FILE_SYSTEM_TYPE := ext4 TARGET_BOOTS_16K := true From 41f7d06b5fa97cea9dc48c597d63af23f3eaee50 Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Wed, 25 Sep 2024 06:27:39 +0000 Subject: [PATCH 09/31] 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: I22cc5398da8cb4d77f5bacbf699d43c280b3e016 --- device-husky.mk | 1 - device-ripcurrent.mk | 1 - device-shiba.mk | 1 - 3 files changed, 3 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 566ea2b..24b5221 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -72,7 +72,6 @@ endif include device/google/shusky/camera/camera.mk include device/google/shusky/audio/husky/audio-tables.mk include device/google/zuma/device-shipping-common.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm20.mk include device/google/gs-common/touch/gti/gti.mk diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 9d81cf0..c963f0b 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -45,7 +45,6 @@ CAMERA_PRODUCT ?= ripcurrent include device/google/shusky/audio/ripcurrent/audio-tables.mk include device/google/shusky/camera/camera.mk include device/google/zuma/device-shipping-common.mk -include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/gps/brcm/cbd_gps.mk include device/google/gs-common/touch/stm/stm20.mk diff --git a/device-shiba.mk b/device-shiba.mk index 5cd1c6f..4ebb46a 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -56,7 +56,6 @@ endif include device/google/shusky/camera/camera.mk include device/google/shusky/audio/shiba/audio-tables.mk include device/google/zuma/device-shipping-common.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/gti/gti.mk From efa15cc3b3f9869a75044d3f5dd49aaa4d881c83 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 10 Oct 2024 11:29:15 +0000 Subject: [PATCH 10/31] Enable TA and FG prefer idle for some camera streams These streams do not disable TA or FG prefer idle, so restore it. Bug: 236868627 Flag: NONE powerhint change does not support flags Test: build pass Change-Id: Ia0f12911110856b82b858bed11fb5d120388285a --- perf/powerhint-husky.json | 42 ++++++++++++++++++++++++++++++++++ perf/powerhint-ripcurrent.json | 42 ++++++++++++++++++++++++++++++++++ perf/powerhint-shiba.json | 42 ++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index f1f31c1..bad5d92 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -1910,6 +1910,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "AutoPreferIdle", @@ -2084,6 +2090,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "AutoPreferIdle", @@ -2126,6 +2138,18 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2282,6 +2306,18 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2408,6 +2444,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "AutoPreferIdle", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 66240a7..d7270a9 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -1775,6 +1775,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "AutoPreferIdle", @@ -1937,6 +1943,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "AutoPreferIdle", @@ -1967,6 +1979,18 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2105,6 +2129,18 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2225,6 +2261,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "AutoPreferIdle", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index f4b465a..c140c6a 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -1815,6 +1815,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "AutoPreferIdle", @@ -1983,6 +1989,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "AutoPreferIdle", @@ -2031,6 +2043,18 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2187,6 +2211,18 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2313,6 +2349,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "AutoPreferIdle", From c12042d741cec83c52d8a2a69b40a645da57c99e Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 11 Oct 2024 21:59:25 +0000 Subject: [PATCH 11/31] powerhint: enable auto_prefer_idle in games Bug: 372961087 Test: manual testing Flag: NONE powerhint config change Change-Id: Ifc9a90073931fdb6cd1e6563fd9240f25d318b69 --- perf/powerhint-husky.json | 2 +- perf/powerhint-shiba.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index bad5d92..ee5d996 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -2875,7 +2875,7 @@ "PowerHint": "GAME", "Node": "AutoPreferIdle", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "GAME", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index c140c6a..1d3185a 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -2768,7 +2768,7 @@ "PowerHint": "GAME", "Node": "AutoPreferIdle", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "GAME", From 71af04af162d22ad73273ab7ca8e0d60bf1a57d4 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Wed, 26 Jun 2024 21:28:09 -0700 Subject: [PATCH 12/31] 16kb: Use PRODUCT_BOOTS_16K to select the kernel and fs The build flag PRODUCT_BOOTS_16K will be used to select whether the shusky devices boot with 16kb kernel or 4kb kernel. Bug: 370842132 Bug: 346868433 Test: Built and booted up the following targets: aosp_shiba_pgagnostic-trunk_staging-userdebug aosp_shiba-trunk_staging-userdebug Flag: EXEMPT bugfix Change-Id: Ia75c7f8cfca6d651777c730a3f86715a0991fbec Merged-In: Ia75c7f8cfca6d651777c730a3f86715a0991fbec --- device-husky.mk | 4 +--- device-shiba.mk | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index f1aec80..59cbe1d 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -31,9 +31,7 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),) include device/google/shusky/uwb/uwb_calibration.mk endif -DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false) - -ifeq ($(DEVICE_PAGE_AGNOSTIC),true) +ifeq ($(PRODUCT_BOOTS_16K),true) TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb TARGET_RW_FILE_SYSTEM_TYPE := ext4 diff --git a/device-shiba.mk b/device-shiba.mk index eadaa37..54e5e6e 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -24,9 +24,7 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers LOCAL_PATH := device/google/shusky -DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false) - -ifeq ($(DEVICE_PAGE_AGNOSTIC),true) +ifeq ($(PRODUCT_BOOTS_16K),true) TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb TARGET_RW_FILE_SYSTEM_TYPE := ext4 From c4818d8641ead59ce3a5bb98f4a45aa44331cd29 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Tue, 2 Jul 2024 11:13:44 -0700 Subject: [PATCH 13/31] 16kb: Set 16kb TARGET_ vars in BoardConfig files and targets TARGET_ build variables MUST NOT be set up in device* files. In the device* files, the PRODUCT_ variables are not defined properly and only after the build system finishes parsing all the product files, we can set up TARGET_ vars based on PRODUCT_ vars. During the parsing of the BoardConfig files, the PRODUCT_ vars are defined and their values can not be changed. Test: Built and booted up `aosp_shiba` and and `aosp_shiba-pgagnostic` targets Bug: 370842132 Bug: 350529323 Bug: 346868433 Flag: EXEMPT bugfix Change-Id: Ic1da7f21b696f1659ef7d7b0b7089c3d2c03103e Merged-In: Ic1da7f21b696f1659ef7d7b0b7089c3d2c03103e --- BoardConfig-shusky-common.mk | 6 +++++- device-husky.mk | 6 +----- device-shiba.mk | 6 +----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/BoardConfig-shusky-common.mk b/BoardConfig-shusky-common.mk index f2ede26..90ceb83 100644 --- a/BoardConfig-shusky-common.mk +++ b/BoardConfig-shusky-common.mk @@ -14,7 +14,11 @@ # limitations under the License. # -ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true) +ifeq ($(TARGET_BOOTS_16K),true) +# Configures the 16kb kernel directory. +TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb + +else ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true) # Configures the 16kb kernel and modules for OTA updates. TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_DIR)/16kb BOARD_KERNEL_PATH_16K := $(TARGET_KERNEL_DIR_16K)/Image.lz4 diff --git a/device-husky.mk b/device-husky.mk index 59cbe1d..f7690fa 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -31,11 +31,7 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),) include device/google/shusky/uwb/uwb_calibration.mk endif -ifeq ($(PRODUCT_BOOTS_16K),true) -TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 -TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb -TARGET_RW_FILE_SYSTEM_TYPE := ext4 -else +ifneq ($(TARGET_BOOTS_16K),true) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION) endif diff --git a/device-shiba.mk b/device-shiba.mk index 54e5e6e..7332d65 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -24,11 +24,7 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers LOCAL_PATH := device/google/shusky -ifeq ($(PRODUCT_BOOTS_16K),true) -TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 -TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb -TARGET_RW_FILE_SYSTEM_TYPE := ext4 -else +ifneq ($(TARGET_BOOTS_16K),true) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION) endif From ffdcb5933cce0e88ed77428d8ee3ab509133e219 Mon Sep 17 00:00:00 2001 From: Vilas Bhat Date: Mon, 1 Jul 2024 21:32:35 +0000 Subject: [PATCH 14/31] 16k: Move BoardConfig-shusky-common.mk to device/google/zuma/BoardConfig-16k-common.mk The makefile logic in this file is identical to the logic required for akita-trunk_staging-userdebug. Hence, this logic is moved to device/google/zuma/BoardConfig-16k-common.mk to avoid duplicating the file for akita. Bug: 370842132 Bug: 349877551 Test: Built and booted up `aosp_shiba` and and `aosp_shiba-pgagnostic` targets Flag: EXEMPT bugfix Change-Id: I80cb3e9f4c4a1609ca668af554d930edb3b4c5a0 Merged-In: I80cb3e9f4c4a1609ca668af554d930edb3b4c5a0 --- BoardConfig-shusky-common.mk | 37 ------------------------------------ husky/BoardConfig.mk | 1 - shiba/BoardConfig.mk | 1 - 3 files changed, 39 deletions(-) delete mode 100644 BoardConfig-shusky-common.mk diff --git a/BoardConfig-shusky-common.mk b/BoardConfig-shusky-common.mk deleted file mode 100644 index 90ceb83..0000000 --- a/BoardConfig-shusky-common.mk +++ /dev/null @@ -1,37 +0,0 @@ -# -# Copyright (C) 2024 The Android Open-Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -ifeq ($(TARGET_BOOTS_16K),true) -# Configures the 16kb kernel directory. -TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb - -else ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true) -# Configures the 16kb kernel and modules for OTA updates. -TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_DIR)/16kb -BOARD_KERNEL_PATH_16K := $(TARGET_KERNEL_DIR_16K)/Image.lz4 - -BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_kernel_boot.modules.load) -BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/system_dlkm.modules.load) -BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_dlkm.modules.load) -BOARD_KERNEL_MODULES_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(TARGET_KERNEL_DIR_16K)/$(notdir $(module))) - -# Shusky targets use exynos-bcm_dbg.ko module instead of bcm_dbg.ko. -BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K)) -BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module))) - -BOARD_16K_OTA_USE_INCREMENTAL := true -BOARD_16K_OTA_MOVE_VENDOR := true -endif \ No newline at end of file diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index 31915d2..f387ff9 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -47,7 +47,6 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on WIFI_FEATURE_REAR_CAMERA_SAR := true $(call soong_config_set,wifi,feature_rear_camera_sar,$(WIFI_FEATURE_REAR_CAMERA_SAR)) -include device/google/shusky/BoardConfig-shusky-common.mk include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 2368ec1..8a5fb4b 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -43,7 +43,6 @@ USES_DEVICE_GOOGLE_SHUSKY := true BOARD_KERNEL_CMDLINE += swiotlb=noforce BOARD_KERNEL_CMDLINE += disable_dma32=on -include device/google/shusky/BoardConfig-shusky-common.mk include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk From e0635d2ad8600b88ca7c9df436b23db7af0e8fee Mon Sep 17 00:00:00 2001 From: Vince Chiu Date: Mon, 14 Oct 2024 16:26:40 +0800 Subject: [PATCH 15/31] Enable CDPreferHighCap for CAMERA_STREAMING_HIGH Test: 1080p60 power and perf, 4k60 power Bug: 371210260 Flag: EXEMPT resource file only change Change-Id: I71d6af9baab500ae6a37bda75a371747263e41c5 --- perf/powerhint-husky.json | 2 +- perf/powerhint-ripcurrent.json | 2 +- perf/powerhint-shiba.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index ee5d996..2192e04 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -2058,7 +2058,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferHighCap", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "CAMERA_STREAMING_HIGH", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index d7270a9..21ff3ba 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -1911,7 +1911,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferHighCap", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "CAMERA_STREAMING_HIGH", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 1d3185a..ab58af3 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -1963,7 +1963,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferHighCap", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "CAMERA_STREAMING_HIGH", From 2ca729d6e558c54940d39f193cba882263fc51e2 Mon Sep 17 00:00:00 2001 From: silens Date: Tue, 29 Oct 2024 10:47:07 +0800 Subject: [PATCH 16/31] Remove 'RELEASE_PIXEL_BROADCAST_ENABLED' This build flag is not used now. Test: build Bug: 376153497 Flag: EXEMPT only modify device config file Change-Id: If8ac0328494e15ee4a18e9316f527d9867a129c0 --- device-husky.mk | 3 +-- device-shiba.mk | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 5f20ed7..669aa12 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -225,11 +225,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.ccp.server.enabled?=true \ bluetooth.profile.vcp.controller.enabled?=true -ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true) +# Bluetooth LE Audio Broadcast PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.bap.broadcast.assist.enabled=true \ bluetooth.profile.bap.broadcast.source.enabled=true -endif # Bluetooth LE Audio enable hardware offloading PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-shiba.mk b/device-shiba.mk index 37a4b46..05f9e05 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -213,11 +213,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.ccp.server.enabled?=true \ bluetooth.profile.vcp.controller.enabled?=true -ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true) +# Bluetooth LE Audio Broadcast PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.bap.broadcast.assist.enabled=true \ bluetooth.profile.bap.broadcast.source.enabled=true -endif # Bluetooth LE Audio enable hardware offloading PRODUCT_PRODUCT_PROPERTIES += \ From 111f28dd81f6ef5cfa30adbe908cb7e9a179910f Mon Sep 17 00:00:00 2001 From: Kyle Hsiao Date: Fri, 8 Nov 2024 04:02:35 +0000 Subject: [PATCH 17/31] [NFC] Enable STNFC_ACTIVERW_TIMER Bug: 378004423 Test: Manual Flag: EXEMPT bugfix Change-Id: I395abcad3d1751f311c3292cbec7545bac5b794e --- 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 51dfb91..0709eb5 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -156,7 +156,7 @@ STNFC_REMOTE_FIELD_TIMER=0x01 ############################################################################### # Configure the ACTIVE_RW timer # Default 0x00, set 0x01 to enable it -# STNFC_ACTIVERW_TIMER=0x01 +STNFC_ACTIVERW_TIMER=0x01 ############################################################################### # Core configuration settings From 4a40152e898f38f6af0479ef9a928a73e6c649f8 Mon Sep 17 00:00:00 2001 From: David Chao Date: Fri, 8 Nov 2024 07:54:11 +0000 Subject: [PATCH 18/31] thermal: update thermal config thb_hda behavior is changed to align with P24 devices, update WLC_CHECK with thb_hda changed. Flag: EXEMPT config update Bug: 377595455 Test: boot to home and thermal throttling worked properly Change-Id: I83005da7543c5886dc695bcee11bcc245588c88e --- thermal/thermal_info_config_charge_husky.json | 21 ++++++++++++++----- thermal/thermal_info_config_charge_shiba.json | 21 ++++++++++++++----- thermal/thermal_info_config_husky.json | 21 ++++++++++++++----- thermal/thermal_info_config_shiba.json | 21 ++++++++++++++----- 4 files changed, 64 insertions(+), 20 deletions(-) diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json index 66b949d..bbbf891 100644 --- a/thermal/thermal_info_config_charge_husky.json +++ b/thermal/thermal_info_config_charge_husky.json @@ -127,13 +127,23 @@ "Multiplier":1 }, { - "Name":"IS_WLC", + "Name":"WLC_CHECK", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["thb_hda"], - "Coefficient":[1], + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[1, -51], + "Multiplier":1 + }, + { + "Name":"NO_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], "Multiplier":1 }, { @@ -153,8 +163,9 @@ "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], - "Coefficient":[1.0, -1000000], + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":["NO_WLC"], + "CoefficientType": ["SENSOR"], "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json index 25fa05d..d539875 100644 --- a/thermal/thermal_info_config_charge_shiba.json +++ b/thermal/thermal_info_config_charge_shiba.json @@ -160,13 +160,23 @@ "Multiplier":1 }, { - "Name":"IS_WLC", + "Name":"WLC_CHECK", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["thb_hda"], - "Coefficient":[1], + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[1, -51], + "Multiplier":1 + }, + { + "Name":"NO_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], "Multiplier":1 }, { @@ -186,8 +196,9 @@ "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], - "Coefficient":[1.0, -1000000], + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":["NO_WLC"], + "CoefficientType": ["SENSOR"], "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 29c24cd..4697c5e 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -717,13 +717,23 @@ "Multiplier":1 }, { - "Name":"IS_WLC", + "Name":"WLC_CHECK", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["thb_hda"], - "Coefficient":[1], + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[1, -51], + "Multiplier":1 + }, + { + "Name":"NO_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], "Multiplier":1 }, { @@ -743,8 +753,9 @@ "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], - "Coefficient":[1.0, -1000000], + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":["NO_WLC"], + "CoefficientType": ["SENSOR"], "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 82c6fbc..0d59047 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -729,13 +729,23 @@ "Multiplier":1 }, { - "Name":"IS_WLC", + "Name":"WLC_CHECK", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["thb_hda"], - "Coefficient":[1], + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[1, -51], + "Multiplier":1 + }, + { + "Name":"NO_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], "Multiplier":1 }, { @@ -755,8 +765,9 @@ "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], - "Coefficient":[1.0, -1000000], + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":["NO_WLC"], + "CoefficientType": ["SENSOR"], "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, From 5399e1c7e8ce2a350e5bcf9b1243644a4f6aa067 Mon Sep 17 00:00:00 2001 From: Isaac Chiou Date: Fri, 1 Nov 2024 07:17:50 +0000 Subject: [PATCH 19/31] Disable Wifi BugReport for subsystem restart Flag: EXEMPT gated by overlay Bug: 373594936 Test: Manuel test, trigger SSR and won't create bugreport automatically Change-Id: I28af1c1400b90b302b3c9b86c1c377dcdfe6db2a --- rro_overlays/WifiOverlay/res/values/config.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index 6519607..3c8427b 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -187,4 +187,6 @@ false: firmware roaming will not be affected. --> true + + false From 6b0cee8be6e232a426f2205334a56a63da4bc07b Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Tue, 12 Nov 2024 07:05:43 +0000 Subject: [PATCH 20/31] shusky: add microphone info for aidl hal. Test: atest VtsHalAudioCoreTargetTest Bug: 377832994 Flag: EXEMPT bugfix Change-Id: I2727420f8943757f223b2b522680267a4c7325a7 --- .../audio_platform_configuration.xml | 206 ++++++++++++++++++ .../audio_platform_configuration.xml | 206 ++++++++++++++++++ 2 files changed, 412 insertions(+) diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml index b34566d..226cf26 100644 --- a/audio/husky/aidl_config/audio_platform_configuration.xml +++ b/audio/husky/aidl_config/audio_platform_configuration.xml @@ -107,6 +107,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml index b34566d..226cf26 100644 --- a/audio/shiba/aidl_config/audio_platform_configuration.xml +++ b/audio/shiba/aidl_config/audio_platform_configuration.xml @@ -107,6 +107,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From fc28f056f7512fee90d121b36231c1e0fb884741 Mon Sep 17 00:00:00 2001 From: jonerlin Date: Mon, 18 Nov 2024 19:19:50 +0000 Subject: [PATCH 21/31] Enable bthal service recovery by restart Bug: 368342010 Test: Fake bt crash and check log Flag: EXEMPT project configuration patch. Change-Id: I70c0f23819011ecd6b7424569e06758596090a8a --- bluetooth/bt_vendor_overlay.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index df3cab7..172d66d 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -40,3 +40,5 @@ BqrEventMaskValueUpdate = 295006 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus BtOpusEnabled = true + +BtHalRecoveryByRestart = true From c93b55b02bcd3c39c08b7f528e7b5e689839f439 Mon Sep 17 00:00:00 2001 From: jonerlin Date: Sun, 13 Oct 2024 21:46:26 +0000 Subject: [PATCH 22/31] bt: add bthal service permission to access bt wakelock control device node Bug: 380024887 Test: BLE scan test and check wakelock time Flag: EXEMPT project configuration patch. Change-Id: Iafce4fea2e80e1eac076ce2258f62bbe5159513a --- conf/init.husky.rc | 1 + conf/init.shiba.rc | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/init.husky.rc b/conf/init.husky.rc index ffd9bd8..3479e7c 100644 --- a/conf/init.husky.rc +++ b/conf/init.husky.rc @@ -41,6 +41,7 @@ on post-fs-data # Bluetooth on post-fs-data chown bluetooth system /proc/bluetooth/timesync + chown bluetooth system /proc/bluetooth/sleep/wakelock_ctrl # Start the twoshay touch service on property:vendor.device.modules.ready=1 diff --git a/conf/init.shiba.rc b/conf/init.shiba.rc index b30f54f..f19c3e2 100644 --- a/conf/init.shiba.rc +++ b/conf/init.shiba.rc @@ -37,6 +37,7 @@ on post-fs-data # Bluetooth on post-fs-data chown bluetooth system /proc/bluetooth/timesync + chown bluetooth system /proc/bluetooth/sleep/wakelock_ctrl # Start the twoshay touch service on property:vendor.device.modules.ready=1 From 758dd1270028ba99efcec255c30d8bf12a6b42c1 Mon Sep 17 00:00:00 2001 From: "Kame(TeYuan) Wang" Date: Thu, 21 Nov 2024 18:14:21 +0000 Subject: [PATCH 23/31] Revert "powerhint: enable auto_prefer_idle in games" Revert submission 29817358-p23_auto_prefer_idle Reason for revert: Power efficiency regression Reverted changes: /q/submissionid:29817358-p23_auto_prefer_idle Bug: 372961087 Test: manual testing Change-Id: I4b24954cb37a469c2d6835e6f01e6abc655ce0b2 --- perf/powerhint-husky.json | 2 +- perf/powerhint-shiba.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index ee5d996..bad5d92 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -2875,7 +2875,7 @@ "PowerHint": "GAME", "Node": "AutoPreferIdle", "Duration": 0, - "Value": "1" + "Value": "0" }, { "PowerHint": "GAME", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 1d3185a..c140c6a 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -2768,7 +2768,7 @@ "PowerHint": "GAME", "Node": "AutoPreferIdle", "Duration": 0, - "Value": "1" + "Value": "0" }, { "PowerHint": "GAME", From 882ac4209991000cdd7f743189845467a7c26a3d Mon Sep 17 00:00:00 2001 From: Limon Mia Date: Fri, 22 Nov 2024 07:09:38 +0000 Subject: [PATCH 24/31] Add Samsung Galaxy Buds 3 pro to the LE audio allow list Bug: 380369950 Test: PTE PQM-BT LE audio unicast test Flag: EXEMPT The Samsung Galaxy Buds 3 pro users are able to disable LE audio in Settings app Change-Id: I142d38d66e844aab35a72733e84374df72158042 --- device-husky.mk | 2 +- device-shiba.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 5f20ed7..417ab87 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -242,7 +242,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 + persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630 # Bluetooth LE Audio CIS handover to SCO # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. diff --git a/device-shiba.mk b/device-shiba.mk index 37a4b46..e74a5d1 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -230,7 +230,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 + persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630 # Bluetooth LE Audio CIS handover to SCO # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. From 3f93d0e415a5e77dc24b50d8ea91866b63895bdd Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Sat, 23 Nov 2024 00:02:40 +0000 Subject: [PATCH 25/31] Revert "thermal: Add JSON Schema Checker" Remove thermal JSON Schema Checker first to avoid the false positive because it cannot support the current thermalHAL design. This reverts commit 97871af7ae276249c8fe3d1380337c4a08436765. Bug: 380370209 Test: build Flag: EXEMPT disable config checker Change-Id: I771d748373520399201b06799737496bfd9c8bad --- thermal/Android.bp | 61 ------------------------------ thermal/thermal_config_test.cpp | 55 --------------------------- thermal/thermal_info_config_test.h | 58 ---------------------------- 3 files changed, 174 deletions(-) delete mode 100644 thermal/Android.bp delete mode 100644 thermal/thermal_config_test.cpp delete mode 100644 thermal/thermal_info_config_test.h diff --git a/thermal/Android.bp b/thermal/Android.bp deleted file mode 100644 index fed2086..0000000 --- a/thermal/Android.bp +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -cc_library { - name: "thermal-config-cpp", - proto: { - type: "lite", - export_proto_headers: true, - include_dirs: [ - "external/protobuf/src", - "device/google/gs-common/thermal/thermal_hal/thermal_config_schemas" - ], - } -} - -cc_test_host { - name: "shusky-thermal-config-test", - srcs: [ - "thermal_config_test.cpp", - ], - static_libs: [ - "libbase", - "libgmock", - "liblog", - "libjsoncpp", - "libjsonpbverify", - "libjsonpbparse", - "thermal_HAL_info_config_proto", - ], - shared_libs: [ - "libprotobuf-cpp-full", - ], - cflags: [ - "-Wall", - "-Werror", - "-Wno-unused-parameter", - ], - data: [ - "*.json" - ], - test_suites: [ - "general-tests", - ], -} \ No newline at end of file diff --git a/thermal/thermal_config_test.cpp b/thermal/thermal_config_test.cpp deleted file mode 100644 index 7b01306..0000000 --- a/thermal/thermal_config_test.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -#include "thermal_info_config_test.h" - -using namespace ::android::jsonpb; -using ::android::base::GetExecutableDirectory; - -namespace devices { -namespace shusky { - -template -JsonSchemaTestConfigFactory MakeTestParam(const std::string &path) { - return android::jsonpb::MakeTestParam(GetExecutableDirectory() + path); -} - -// Make test suite for thermal info config schema. -INSTANTIATE_TEST_SUITE_P( - ThermalSuite, ThermalInfoConfigTest, - ::testing::Values( - MakeTestParam("/thermal_info_config_husky.json"), - MakeTestParam("/thermal_info_config_shiba.json"), - MakeTestParam("/thermal_info_config_charge_husky.json"), - MakeTestParam("/thermal_info_config_charge_shiba.json"), - MakeTestParam("/thermal_info_config_ripcurrent.json"), - MakeTestParam( - "/thermal_info_config_charge_ripcurrent.json"))); - -// Ignores a formatting check (b/c 0.0 != 0 textually) -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(JsonSchemaTest); - -int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} - -} // namespace shusky -} // namespace devices diff --git a/thermal/thermal_info_config_test.h b/thermal/thermal_info_config_test.h deleted file mode 100644 index 1864420..0000000 --- a/thermal/thermal_info_config_test.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include - -#include -#include - -#include "thermal_info_config.pb.h" - -namespace devices { -namespace shusky { - -// JSON schema test wrapper. -class ThermalInfoConfigTest : public android::jsonpb::JsonSchemaTest { -public: - void SetUp() override { - JsonSchemaTest::SetUp(); - thermalInfoConfig_ = static_cast(message()); - } - ThermalConfig *thermalInfoConfig_ = nullptr; -}; - -// Individual test checking for sensor name and type as required fields. -TEST_P(ThermalInfoConfigTest, ThermalConfigRequiredFields) { - std::string error; - - // Checks that no unknown fields are introduced. - EXPECT_TRUE(android::jsonpb::AllFieldsAreKnown(*object_, json_, &error)) - << "File: " << file_path_ << ": " << error; - - // Check all Sensors have a Name and Type. - for (int i = 0; i < thermalInfoConfig_->sensors_size(); ++i) { - auto &&sensor = thermalInfoConfig_->sensors(i); - EXPECT_FALSE(sensor.name().empty()) - << "No name for sensor #" << i << " in " << file_path_; - EXPECT_FALSE(sensor.type().empty()) - << "No type for sensor " << sensor.name() << " in " << file_path_; - } -}; - -} // namespace shusky -} // namespace devices \ No newline at end of file From eb79ff9e68a6a4167fd9477ed2ccf2fcca1a8ee1 Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Thu, 22 Aug 2024 01:05:54 +0000 Subject: [PATCH 26/31] PowerHint: Refine FIXED_PERFORMANCE mode CPU Frequencies Set the CPU frequencies of FIXED_PERFORMANCE to align with Thermal CPU Light level. Bug: 327070837 Test: Boot to home Flag: NONE powerhal doesn't have a flag yet Change-Id: Ibb698b608c21c2a4f81354f852cb077345907947 --- perf/powerhint-husky.json | 15 +++++++++------ perf/powerhint-shiba.json | 17 ++++++++++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 7b53b72..973dd45 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -97,6 +97,7 @@ "Values": [ "9999999", "1548000", + "1425000", "1197000", "0" ], @@ -136,6 +137,7 @@ "9999999", "2245000", "2130000", + "1572000", "1836000", "0" ], @@ -177,6 +179,7 @@ "2687000", "2363000", "2147000", + "1745000", "1885000", "0" ], @@ -2624,37 +2627,37 @@ "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "9999999" + "Value": "1745000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUBigClusterMinFreq", "Duration": 0, - "Value": "9999999" + "Value": "1745000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "9999999" + "Value": "1572000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUMidClusterMinFreq", "Duration": 0, - "Value": "9999999" + "Value": "1572000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "9999999" + "Value": "1425000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPULittleClusterMinFreq", "Duration": 0, - "Value": "9999999" + "Value": "1425000" }, { "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 18c9ef0..afdab3d 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -97,6 +97,7 @@ "Values": [ "9999999", "1548000", + "1425000", "1197000", "0" ], @@ -132,6 +133,7 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", "Values": [ "9999999", + "1572000", "1836000", "0" ], @@ -168,6 +170,7 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq", "Values": [ "9999999", + "1745000", "1885000", "0" ], @@ -2157,7 +2160,7 @@ "Duration": 0, "Value": "cam1" }, - { + { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUUtilThreshold", "Duration": 0, @@ -2529,37 +2532,37 @@ "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "9999999" + "Value": "1745000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUBigClusterMinFreq", "Duration": 0, - "Value": "9999999" + "Value": "1745000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "9999999" + "Value": "1572000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUMidClusterMinFreq", "Duration": 0, - "Value": "9999999" + "Value": "1572000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "9999999" + "Value": "1425000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPULittleClusterMinFreq", "Duration": 0, - "Value": "9999999" + "Value": "1425000" }, { "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", From dcc325566beaa0850a75a1a9917e0338f297b865 Mon Sep 17 00:00:00 2001 From: Chris Paulo Date: Wed, 25 Sep 2024 15:24:09 -0700 Subject: [PATCH 27/31] shusky/haptics: Remove voltage restriction for haptics Remove the voltage restriction for haptics since DVL is enabled. This will allow FW control for exertion protection of the motor, and allow for stronger output for audio-haptics. Bug: 318476589 Flag: EXEMPT config xml change Test: dumpsys vibrator_manager and accel measurement Change-Id: Ic8ece936df599725ad1ab66089b0f66a3791e422 --- husky/overlay/frameworks/base/core/res/res/values/config.xml | 3 --- .../overlay/frameworks/base/core/res/res/values/config.xml | 2 -- shiba/overlay/frameworks/base/core/res/res/values/config.xml | 3 --- 3 files changed, 8 deletions(-) diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml index 893d3ba..a543d1a 100644 --- a/husky/overlay/frameworks/base/core/res/res/values/config.xml +++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml @@ -300,9 +300,6 @@ true - - 0.335 - 105% diff --git a/ripcurrent/overlay/frameworks/base/core/res/res/values/config.xml b/ripcurrent/overlay/frameworks/base/core/res/res/values/config.xml index 40dd9d6..97d8b95 100644 --- a/ripcurrent/overlay/frameworks/base/core/res/res/values/config.xml +++ b/ripcurrent/overlay/frameworks/base/core/res/res/values/config.xml @@ -231,6 +231,4 @@ 283 - - 0.335 diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml index fcbbc46..b2a1a13 100644 --- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml +++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml @@ -294,9 +294,6 @@ true - - 0.335 - 105% From 53e6a3d054cc32e0fa3c7ab2de2c560ab166649a Mon Sep 17 00:00:00 2001 From: Zouberou Sayibou Date: Sat, 30 Nov 2024 06:46:02 +0000 Subject: [PATCH 28/31] shusky: Remove dbc properties for fw 7.2.81. Removing dbc properties after adding dbc tuning file for shiba and husky. Bug: 377913163 Flag: EXEMPT mk only update Test: atest PtsVibratorHalTestSuite \ PtsHapticsTestCases \ VibratorHalCs40l26TestSuite \ VtsHalVibratorManagerTargetTest \ VtsHalVibratorTargetTest \ CtsVibratorTestCases Change-Id: I59d864dd459b8622af3b119a849f0617a1027207 Signed-off-by: Zouberou Sayibou --- device-husky.mk | 9 +-------- device-shiba.mk | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 5f20ed7..19fc535 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -410,14 +410,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.vibrator.hal.context.scale=60 \ persist.vendor.vibrator.hal.context.fade=true \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \ - persist.vendor.vibrator.hal.context.settlingtime=5000 \ - ro.vendor.vibrator.hal.dbc.enable=true \ - ro.vendor.vibrator.hal.dbc.envrelcoef=8353728 \ - ro.vendor.vibrator.hal.dbc.riseheadroom=1909602 \ - ro.vendor.vibrator.hal.dbc.fallheadroom=1909602 \ - ro.vendor.vibrator.hal.dbc.txlvlthreshfs=2516583 \ - ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \ - ro.vendor.vibrator.hal.pm.activetimeout=5 + persist.vendor.vibrator.hal.context.settlingtime=5000 # Override Output Distortion Gain PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-shiba.mk b/device-shiba.mk index 37a4b46..a8186b3 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -387,14 +387,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.vibrator.hal.context.scale=60 \ persist.vendor.vibrator.hal.context.fade=true \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \ - persist.vendor.vibrator.hal.context.settlingtime=5000 \ - ro.vendor.vibrator.hal.dbc.enable=true \ - ro.vendor.vibrator.hal.dbc.envrelcoef=8353728 \ - ro.vendor.vibrator.hal.dbc.riseheadroom=1909602 \ - ro.vendor.vibrator.hal.dbc.fallheadroom=1909602 \ - ro.vendor.vibrator.hal.dbc.txlvlthreshfs=2516583 \ - ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \ - ro.vendor.vibrator.hal.pm.activetimeout=5 + persist.vendor.vibrator.hal.context.settlingtime=5000 # Override Output Distortion Gain PRODUCT_VENDOR_PROPERTIES += \ From a0670ae6e7a35bc1b2418f872424d428c9e0d324 Mon Sep 17 00:00:00 2001 From: Zouberou Sayibou Date: Tue, 3 Dec 2024 02:47:11 +0000 Subject: [PATCH 29/31] Revert "shusky/haptics: Remove voltage restriction for haptics" Revert submission 30661505-tdm_amplitude_limitation_removal_dvl Reason for revert: short time to properly test before 25q1 cut-off. Reverted changes: /q/submissionid:30661505-tdm_amplitude_limitation_removal_dvl Bug: 318476589 Change-Id: I7d0fc0f64aa41cd901797cfc4a81eb41e7de1c05 --- husky/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ .../overlay/frameworks/base/core/res/res/values/config.xml | 2 ++ shiba/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 3 files changed, 8 insertions(+) diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml index a543d1a..893d3ba 100644 --- a/husky/overlay/frameworks/base/core/res/res/values/config.xml +++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml @@ -300,6 +300,9 @@ true + + 0.335 + 105% diff --git a/ripcurrent/overlay/frameworks/base/core/res/res/values/config.xml b/ripcurrent/overlay/frameworks/base/core/res/res/values/config.xml index 97d8b95..40dd9d6 100644 --- a/ripcurrent/overlay/frameworks/base/core/res/res/values/config.xml +++ b/ripcurrent/overlay/frameworks/base/core/res/res/values/config.xml @@ -231,4 +231,6 @@ 283 + + 0.335 diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml index b2a1a13..fcbbc46 100644 --- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml +++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml @@ -294,6 +294,9 @@ true + + 0.335 + 105% From fc98bc4ea67cb3f03b2680610894a154c48bcc49 Mon Sep 17 00:00:00 2001 From: David Li Date: Thu, 5 Dec 2024 11:43:32 +0000 Subject: [PATCH 30/31] audio: align volume curve Bug: 382270418 Test: n/a Flag: EXEMPT bugfix Change-Id: I396b61b57a07307285abeffa911fafdb04221e91 --- .../aidl_config/audio_policy_volumes.xml | 106 +++++++++++------- audio/shiba/aidl_config/mixer_paths_aidl.xml | 2 +- 2 files changed, 66 insertions(+), 42 deletions(-) diff --git a/audio/shiba/aidl_config/audio_policy_volumes.xml b/audio/shiba/aidl_config/audio_policy_volumes.xml index 3fe738d..b087a21 100644 --- a/audio/shiba/aidl_config/audio_policy_volumes.xml +++ b/audio/shiba/aidl_config/audio_policy_volumes.xml @@ -51,8 +51,14 @@ volume index from 0 to 100. 66,-2200 100,-1800 - + + 1,-4500 + 29,-3400 + 57,-2250 + 71,-1900 + 86,-1530 + 100,-1100 + - 1,-2970 - 33,-2010 - 66,-1020 + 1,-4000 + 29,-2950 + 43,-2350 + 57,-1850 + 71,-1400 + 86,-700 100,0 - 1,-6438 - 4,-6438 - 8,-5961 - 12,-5543 - 16,-5167 - 20,-4743 - 24,-4391 - 28,-4061 - 32,-3871 - 36,-3673 - 40,-3471 - 44,-3273 - 48,-3065 - 52,-2850 - 56,-2618 - 60,-2355 - 64,-2060 - 68,-1773 - 72,-1482 - 76,-1205 - 80,-989 - 84,-791 - 88,-578 - 92,-374 - 96,-137 + 1,-5927 + 4,-5927 + 8,-5574 + 12,-5281 + 16,-4952 + 20,-4562 + 24,-4213 + 28,-3838 + 32,-3600 + 36,-3385 + 40,-3116 + 44,-2927 + 48,-2665 + 52,-2436 + 56,-2181 + 60,-1985 + 64,-1743 + 68,-1553 + 72,-1427 + 76,-1166 + 80,-1045 + 84,-895 + 88,-644 + 92,-486 + 96,-209 100,0 - 0,-2970 - 33,-2010 - 66,-1020 + 0,-5600 + 29,-3520 + 57,-1500 + 71,-1150 + 86,-500 100,0 - 1,-2970 - 33,-2010 - 66,-1020 - 100,0 + 1,-4500 + 29,-3800 + 71,-1850 + 86,-1000 + 100,-500 @@ -165,8 +177,14 @@ volume index from 0 to 100. 66,-2200 100,-1800 - + + 1,-4500 + 29,-3400 + 57,-2250 + 71,-1900 + 86,-1530 + 100,-1100 + 66,-2200 100,-1800 - + + 1,-5700 + 29,-4230 + 43,-3300 + 57,-3100 + 71,-2500 + 100,-1400 + - + From 7571b12f0ee630907dcefb5f84397ea743f40a11 Mon Sep 17 00:00:00 2001 From: Dmitry Skiba Date: Fri, 6 Dec 2024 07:16:02 +0000 Subject: [PATCH 31/31] Add a way to disable auto prefer fit for launch. This change introduces "is APF enabled" system properties, and uses them as trigger conditions for APF nodes / pre-APF nodes. By default APF nodes are active, and pre-APF nodes are inactive, which maintains the situation before this change. A future experiment will flip "is APF enabled" system properties, deactivating APF nodes and activating pre-APF nodes. For more info see go/pixel-perf-apf-experiment. Bug: 365855872 Test: set vendor.powerhal.apf_enabled=false, vendor.powerhal.apf_disabled=true, observe auto_prefer_fit procfs value staying "false" and instead preferred_idle_mask_mid changing to 0x1ff during app launches Flag: NONE powerhint change does not support flags Change-Id: I85b5dc812132f229c2cc8583aaadd31d7eedc178 Signed-off-by: Dmitry Skiba --- device-husky.mk | 5 +++++ device-ripcurrent.mk | 5 +++++ device-shiba.mk | 5 +++++ perf/powerhint-husky.json | 36 ++++++++++++++++++++++++++-------- perf/powerhint-ripcurrent.json | 36 ++++++++++++++++++++++++++-------- perf/powerhint-shiba.json | 36 ++++++++++++++++++++++++++-------- 6 files changed, 99 insertions(+), 24 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 384e6cb..d53f746 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -535,3 +535,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/shusky/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json + +# Enable APF by default +PRODUCT_VENDOR_PROPERTIES += \ + vendor.powerhal.apf_disabled=false \ + vendor.powerhal.apf_enabled=true diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index c963f0b..d22ebca 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -279,3 +279,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # PKVM Memory Reclaim PRODUCT_VENDOR_PROPERTIES += \ hypervisor.memory_reclaim.supported=1 + +# Enable APF by default +PRODUCT_VENDOR_PROPERTIES += \ + vendor.powerhal.apf_disabled=false \ + vendor.powerhal.apf_enabled=true diff --git a/device-shiba.mk b/device-shiba.mk index 9d1f018..f8bcaed 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -504,3 +504,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/caimito/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json + +# Enable APF by default +PRODUCT_VENDOR_PROPERTIES += \ + vendor.powerhal.apf_disabled=false \ + vendor.powerhal.apf_enabled=true diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 973dd45..8a52086 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -917,6 +917,13 @@ "Duration": 5000, "Value": "0x1ff" }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskMid", + "Duration": 5000, + "Value": "0x1ff", + "EnableProperty": "vendor.powerhal.apf_disabled" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -976,6 +983,13 @@ "Duration": 5000, "Value": "615" }, + { + "PowerHint": "LAUNCH", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_disabled" + }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1050,37 +1064,43 @@ "PowerHint": "LAUNCH", "Node": "TAAutoPreferFit", "Duration": 5000, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceEnable", "Duration": 5000, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceHighValue", - "Duration": 5000, - "Value": "765" + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceHighPrio", "Duration": 5000, - "Value": "110" + "Value": "110", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceMidValue", - "Duration": 5000, - "Value": "570" + "Duration": 5000, + "Value": "570", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceMidPrio", "Duration": 5000, - "Value": "139" + "Value": "139", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index ff4043f..10b337a 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -945,6 +945,13 @@ "Duration": 5000, "Value": "0x1ff" }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskMid", + "Duration": 5000, + "Value": "0x1ff", + "EnableProperty": "vendor.powerhal.apf_disabled" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1004,6 +1011,13 @@ "Duration": 5000, "Value": "615" }, + { + "PowerHint": "LAUNCH", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_disabled" + }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1078,37 +1092,43 @@ "PowerHint": "LAUNCH", "Node": "TAAutoPreferFit", "Duration": 5000, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceEnable", "Duration": 5000, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceHighValue", - "Duration": 5000, - "Value": "765" + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceHighPrio", "Duration": 5000, - "Value": "110" + "Value": "110", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceMidValue", - "Duration": 5000, - "Value": "570" + "Duration": 5000, + "Value": "570", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceMidPrio", "Duration": 5000, - "Value": "139" + "Value": "139", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index afdab3d..7435de5 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -918,6 +918,13 @@ "Duration": 5000, "Value": "0x1ff" }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferredIdleMaskMid", + "Duration": 5000, + "Value": "0x1ff", + "EnableProperty": "vendor.powerhal.apf_disabled" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -977,6 +984,13 @@ "Duration": 5000, "Value": "615" }, + { + "PowerHint": "LAUNCH", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_disabled" + }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1051,37 +1065,43 @@ "PowerHint": "LAUNCH", "Node": "TAAutoPreferFit", "Duration": 5000, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceEnable", "Duration": 5000, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceHighValue", - "Duration": 5000, - "Value": "765" + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceHighPrio", "Duration": 5000, - "Value": "110" + "Value": "110", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceMidValue", - "Duration": 5000, - "Value": "570" + "Duration": 5000, + "Value": "570", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH", "Node": "TAUclampMinOnNiceMidPrio", "Duration": 5000, - "Value": "139" + "Value": "139", + "EnableProperty": "vendor.powerhal.apf_enabled" }, { "PowerHint": "LAUNCH",