Merge "audio: remove unused device" into main
diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk
index 252e397..6496ad0 100644
--- a/bluejay/BoardConfig.mk
+++ b/bluejay/BoardConfig.mk
@@ -21,14 +21,15 @@
endif
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_BLUEJAY_RADIO_DIR)
-RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR ?= trunk # Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR ?= pdk# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR)
-$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR))
+$(call soong_config_set,bluejay_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR))
# Enable load module in parallel
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
# The modules which need to be loaded in sequential
+BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 3999e04..9898ba7 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -230,6 +230,7 @@
PRODUCT_SHIPPING_API_LEVEL := 32
# Vibrator HAL
+$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.vibrator.hal.supported_primitives=243 \
diff --git a/gps.xml.b3 b/gps.xml.b3
index fd10075..9ee4e24 100644
--- a/gps.xml.b3
+++ b/gps.xml.b3
@@ -68,7 +68,7 @@
<gll
PpsEnable="true"
LogPriMask="LOG_INFO"
- LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
+ LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1"
MultiCarrLnaMask="L1_EXT_ON"
diff --git a/powerhint.json b/powerhint.json
index dfce97a..b2d3388 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -1837,12 +1837,23 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_EfficientBase": 400,
+ "UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"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",
@@ -1861,12 +1872,23 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_EfficientBase": 400,
+ "UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"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",
@@ -1885,12 +1907,23 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_EfficientBase": 400,
+ "UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"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",
@@ -1910,6 +1943,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 197,
"UclampMin_Low": 197,
+ "UclampMax_EfficientBase": 400,
+ "UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
@@ -1932,6 +1967,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 53,
"UclampMin_Low": 53,
+ "UclampMax_EfficientBase": 400,
+ "UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
@@ -1954,6 +1991,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
+ "UclampMax_EfficientBase": 400,
+ "UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
diff --git a/thermal_info_config_bluejay.json b/thermal_info_config_bluejay.json
index a8a1166..17b0eb0 100644
--- a/thermal_info_config_bluejay.json
+++ b/thermal_info_config_bluejay.json
@@ -960,106 +960,6 @@
"Hidden":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,
- "Hidden":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,
- "Hidden":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,
- "Hidden":true
- },
- {
- "Name":"soft_ocp_gpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 9000,
- "NAN",
- "NAN"
- ],
- "HotHysteresis":[
- 0.0,
- 0.0,
- 0.0,
- 0.0,
- 100,
- 0.0,
- 0.0
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Hidden":true
- },
- {
"Name":"TPU",
"Type":"NPU",
"HotThreshold":[
