Merge "Vibrator: Set Soong Config variable - kernel_ver" into main
diff --git a/felix/BoardConfig.mk b/felix/BoardConfig.mk
index dcab2af..fdd4c79 100644
--- a/felix/BoardConfig.mk
+++ b/felix/BoardConfig.mk
@@ -21,9 +21,9 @@
BOARD_KERNEL_CMDLINE += swiotlb=noforce
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_RADIO_DIR)
-RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR ?= trunk # Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR ?= pdk# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR)
-$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR))
+$(call soong_config_set,felix_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR))
# Enable load module in parallel
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
diff --git a/powerhint.json b/powerhint.json
index 206d742..926d7c4 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -2207,7 +2207,16 @@
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 83333330,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 15.0
+ "StaleTimeFactor": 15.0,
+ "HeuristicBoost_On": true,
+ "HBoostOnMissedCycles": 8,
+ "HBoostOffMaxAvgRatio": 4.0,
+ "HBoostOffMissedCycles": 5,
+ "HBoostPidPuFactor": 0.5,
+ "HBoostUclampMin": 722,
+ "JankCheckTimeFactor": 1.2,
+ "LowFrameRateThreshold": 25,
+ "MaxRecordsNum": 300
},
{
"Name": "REFRESH_90FPS",
@@ -2233,7 +2242,16 @@
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 111111110,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 15.0
+ "StaleTimeFactor": 15.0,
+ "HeuristicBoost_On": true,
+ "HBoostOnMissedCycles": 8,
+ "HBoostOffMaxAvgRatio": 4.0,
+ "HBoostOffMissedCycles": 5,
+ "HBoostPidPuFactor": 0.5,
+ "HBoostUclampMin": 722,
+ "JankCheckTimeFactor": 1.2,
+ "LowFrameRateThreshold": 25,
+ "MaxRecordsNum": 300
},
{
"Name": "REFRESH_60FPS",
@@ -2259,7 +2277,16 @@
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 166666660,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 15.0
+ "StaleTimeFactor": 15.0,
+ "HeuristicBoost_On": true,
+ "HBoostOnMissedCycles": 8,
+ "HBoostOffMaxAvgRatio": 4.0,
+ "HBoostOffMissedCycles": 5,
+ "HBoostPidPuFactor": 0.5,
+ "HBoostUclampMin": 722,
+ "JankCheckTimeFactor": 1.2,
+ "LowFrameRateThreshold": 25,
+ "MaxRecordsNum": 300
},
{
"Name": "UiHighBoostWithoutPid",
