diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml
index 2d1b259..695e2c6 100644
--- a/audio/tangorpro/config/audio_policy_configuration.xml
+++ b/audio/tangorpro/config/audio_policy_configuration.xml
@@ -187,7 +187,7 @@
+ sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output,immersive_out"/>
default
-
- android.hardware.graphics.mapper
- passthrough
- 4.0
-
- IMapper
- default
-
-
android.hardware.graphics.composer
hwbinder
diff --git a/powerhint.json b/powerhint.json
index 79e1c35..bf987f7 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -1632,18 +1632,6 @@
"Duration": 50,
"Value": "1"
},
- {
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "100"
- },
- {
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "1500"
- },
{
"PowerHint": "EXPENSIVE_RENDERING",
"Node": "PowerHALRenderingState",
@@ -1894,11 +1882,12 @@
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk
index 0a83b85..382f609 100644
--- a/tangorpro/BoardConfig.mk
+++ b/tangorpro/BoardConfig.mk
@@ -38,6 +38,7 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce
include device/google/gs201/BoardConfig-common.mk
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
-include vendor/google_devices/tangorpro/proprietary/BoardConfigVendor.mk
include device/google/tangorpro-sepolicy/tangorpro-sepolicy.mk
include device/google/tangorpro/wifi/BoardConfig-wifi.mk
diff --git a/thermal_info_config_charge_tangorpro.json b/thermal_info_config_charge_tangorpro.json
index f167181..d359a88 100644
--- a/thermal_info_config_charge_tangorpro.json
+++ b/thermal_info_config_charge_tangorpro.json
@@ -8,21 +8,18 @@
{
"Name":"neutral_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "35.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
- "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"charger_skin_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "39.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
- "TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -30,14 +27,12 @@
{
"Name":"disp_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"usb_pwr_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "37.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000
@@ -45,7 +40,6 @@
{
"Name":"usb_pwr_therm2",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
"Multiplier":0.001
},
{
diff --git a/thermal_info_config_tangorpro.json b/thermal_info_config_tangorpro.json
index 5260a34..06489c2 100644
--- a/thermal_info_config_tangorpro.json
+++ b/thermal_info_config_tangorpro.json
@@ -4,7 +4,6 @@
"Name":"neutral_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "50.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
- "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -12,14 +11,12 @@
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"charger_skin_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "39.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
- "TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -28,7 +25,6 @@
"Name":"disp_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "37.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
- "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -42,7 +38,6 @@
"Name":"usb_pwr_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", "37.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000
@@ -50,7 +45,6 @@
{
"Name":"usb_pwr_therm2",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
"Multiplier":0.001
},
{
@@ -343,319 +337,28 @@
"Name":"ISP",
"Type":"NPU",
"Multiplier":0.001
- },
- {
- "Name":"battery_cycle",
- "Type":"BCL_VOLTAGE",
- "Multiplier":1
- },
- {
- "Name":"critical-battery-cell",
- "Type":"BCL_VOLTAGE",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "vdroop1",
- "Combination":["battery", "battery_cycle", "vdroop1"],
- "Coefficient":[-10000, 400, 1000],
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"],
- "Multiplier":1,
- "Monitor":true
- },
- {
- "Name":"FLASH_LED_REDUCE",
- "Type":"UNKNOWN",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "vdroop1",
- "Combination":["battery", "battery_cycle", "vdroop1"],
- "Coefficient":[-10000, 400, 1000],
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN", "NAN"],
- "Multiplier":1,
- "Monitor":true,
- "SendPowerHint":true
- },
- {
- "Name":"soc",
- "Type":"BCL_PERCENTAGE",
- "HotThreshold":["NAN", "NAN", 70, "NAN", "NAN", "NAN", "NAN"],
- "Multiplier":1
- },
- {
- "Name":"BCL_TPU_LOW_TEMP",
- "Type":"BCL_CURRENT",
- "VirtualSensor":true,
- "Formula":"WEIGHTED_AVG",
- "TriggerSensor": "ocp_tpu",
- "Combination":["ocp_tpu", "battery"],
- "Coefficient":[1, -10],
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
- "Multiplier":1,
- "Monitor":true,
- "BindedCdevInfo": [
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
- }
- ]
- },
- {
- "Name":"BCL_GPU_LOW_TEMP",
- "Type":"BCL_CURRENT",
- "VirtualSensor":true,
- "Formula":"WEIGHTED_AVG",
- "TriggerSensor": "ocp_gpu",
- "Combination":["ocp_gpu", "battery"],
- "Coefficient":[1, -10],
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"],
- "Multiplier":1,
- "Monitor":true,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 11, 11, 11]
- }
- ]
- },
- {
- "Name":"BCL_BATOILO_GPU_LOW_TEMP",
- "Type":"BCL_CURRENT",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "batoilo",
- "Combination":["batoilo", "ocp_gpu", "battery"],
- "Coefficient":[5000, 12000, -1000 ],
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"],
- "Multiplier":1,
- "Monitor":true,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 11, 11, 11]
- }
- ]
- },
- {
- "Name":"BCL_BATOILO_TPU_LOW_TEMP",
- "Type":"BCL_CURRENT",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "batoilo",
- "Combination":["batoilo", "ocp_tpu", "battery"],
- "Coefficient":[5000, 12000, -1000],
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"],
- "Multiplier":1,
- "Monitor":true,
- "BindedCdevInfo": [
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
- }
- ]
- },
- {
- "Name":"BCL_BATOILO_GPU",
- "Type":"BCL_CURRENT",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "batoilo",
- "Combination":["batoilo", "ocp_gpu"],
- "Coefficient":[5000, 12000],
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
- "Multiplier":1,
- "Monitor":true,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
- }
- ]
- },
- {
- "Name":"BCL_BATOILO_TPU",
- "Type":"BCL_CURRENT",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "batoilo",
- "Combination":[
- "batoilo",
- "ocp_tpu"
- ],
- "Coefficient":[5000, 12000],
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
- "Multiplier":1,
- "Monitor":true,
- "BindedCdevInfo": [
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 6, 6, 6]
- }
- ]
- },
- {
- "Name":"batoilo",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Monitor":true,
- "PollingDelay":0,
- "PassiveDelay":60000,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-cpufreq-2",
- "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
- },
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
- }
- ]
- },
- {
- "Name":"BCL_AUDIO_BAACL",
- "Type":"BCL_VOLTAGE",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "soc",
- "Combination":["battery", "soc"],
- "Coefficient":[-45000, 70],
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"],
- "Multiplier":1,
- "Monitor":true
- },
- {
- "Name":"vdroop1",
- "Type":"BCL_VOLTAGE",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Monitor":true,
- "PollingDelay":0,
- "PassiveDelay":60000,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-cpufreq-2",
- "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
- },
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
- }
- ]
- },
- {
- "Name":"vdroop2",
- "Type":"BCL_VOLTAGE",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Monitor":true,
- "PollingDelay":0,
- "PassiveDelay":60000,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-cpufreq-2",
- "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
- },
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
- }
- ]
- },
- {
- "Name":"smpl_gm",
- "Type":"BCL_VOLTAGE",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Monitor":true,
- "PollingDelay":0,
- "PassiveDelay":60000,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-cpufreq-2",
- "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
- },
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
- }
- ]
- },
- {
- "Name":"ocp_cpu1",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"ocp_cpu2",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"ocp_tpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"ocp_gpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
}
],
"CoolingDevices":[
{
"Name":"thermal-cpufreq-0",
"Type":"CPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
- "State2Power":[1100, 1050, 1000, 950, 900, 850, 800, 750, 700, 650, 600]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote"
},
{
"Name":"thermal-cpufreq-1",
"Type":"CPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
- "State2Power":[1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote"
},
{
"Name":"thermal-cpufreq-2",
"Type":"CPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
- "State2Power":[1450, 1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
},
{
"Name":"thermal-gpufreq-0",
"Type":"GPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote",
- "State2Power":[4371, 3543, 3085, 2293, 1927, 1707, 1394, 1171, 967, 768, 592, 433]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
},
{
"Name":"tpu_cooling",