From 2dcd116560e72c2de2538809edf17ca15e7ff917 Mon Sep 17 00:00:00 2001 From: Haoming Wu Date: Sat, 14 Jan 2023 02:31:44 +0000 Subject: [PATCH 1/5] Add libcast_auth to PRODUCT_PACKAGES Bug: 265445490 Test: test on device Change-Id: I9724d979399574b90cda8fd40623851e17af6e70 --- device-tangorpro.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index e6a9cdb..a6fe043 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -174,6 +174,9 @@ PRODUCT_SOONG_NAMESPACES += \ PRODUCT_COPY_FILES += \ device/google/tangorpro/cast_auth/tangor_ica.crt:$(TARGET_COPY_OUT_VENDOR)/etc/cert-chain.crt +PRODUCT_PACKAGES += \ + libcast_auth + PRODUCT_PACKAGES_DEBUG += \ test_cast_auth From 807c27a95efdd10454f7ffb0ee1f35d4e6d6acc4 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Thu, 12 Jan 2023 10:47:58 +0800 Subject: [PATCH 2/5] thermal: Update trigger sensors - Add disp_therm, neutral_therm as VSkin trigger sensors. - Remove quiet_therm as trigger sensor. Bug: 261149274 Test: Update local config and use emul_temp Change-Id: I904af100ad5e684a24cfdeb3f600cf28ed2ccd78 --- thermal_info_config_tangorpro.json | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/thermal_info_config_tangorpro.json b/thermal_info_config_tangorpro.json index 6dd33f0..5c6708d 100644 --- a/thermal_info_config_tangorpro.json +++ b/thermal_info_config_tangorpro.json @@ -3,17 +3,17 @@ { "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 + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 }, { "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, - "PollingDelay":60000, - "PassiveDelay":7000 + "Multiplier":0.001 }, { "Name":"charger_skin_therm", @@ -27,8 +27,11 @@ { "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 + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 }, { "Name":"battery", @@ -106,7 +109,7 @@ "Name":"VIRTUAL-SKIN", "Type":"SKIN", "VirtualSensor":true, - "TriggerSensor":"quiet_therm", + "TriggerSensor":["disp_therm", "neutral_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"], "Coefficient":["1.0", "1.0", "1.0", "1.0"], @@ -122,7 +125,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":"quiet_therm", + "TriggerSensor":["disp_therm", "neutral_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"], "Coefficient":["1.0", "1.0", "1.0", "1.0"], @@ -138,7 +141,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":"quiet_therm", + "TriggerSensor":["disp_therm", "neutral_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"], "Coefficient":["1.0", "1.0", "1.0", "1.0"], From cdee1127cfe7e22add5c916b4b1b9c4ff37147b6 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Thu, 12 Jan 2023 11:48:24 +0800 Subject: [PATCH 3/5] thermal: Update Vskin shutdown threshold Bug: 254021613 Test: use to emul_temp to trigger shutdown Change-Id: Idba86c31cc49463e81f23577acacf261ea926600 --- thermal_info_config_tangorpro.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/thermal_info_config_tangorpro.json b/thermal_info_config_tangorpro.json index 5c6708d..300cc43 100644 --- a/thermal_info_config_tangorpro.json +++ b/thermal_info_config_tangorpro.json @@ -113,7 +113,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"], "Coefficient":["1.0", "1.0", "1.0", "1.0"], - "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "51.0", "140.0"], + "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "51.5", "56.0"], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "SendCallback":true, @@ -129,7 +129,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"], "Coefficient":["1.0", "1.0", "1.0", "1.0"], - "HotThreshold":["NAN", "37.0", "43.0", "45.0", "47.0", "51.0", "140.0"], + "HotThreshold":["NAN", "37.0", "43.0", "45.0", "47.0", "51.5", "56.0"], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "SendPowerHint":true, @@ -145,7 +145,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"], "Coefficient":["1.0", "1.0", "1.0", "1.0"], - "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "51.0", "140.0"], + "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "51.5", "56.0"], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, @@ -210,7 +210,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"], "Coefficient":["1.0", "1.0", "1.0", "1.0"], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "138.0", "NAN"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "54.0", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001, "Monitor":true, From c6737051ac04da4e5b3cce211df72f7dd11556ed Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Fri, 9 Dec 2022 15:40:15 +0800 Subject: [PATCH 4/5] Thermal: Remove Camera Powerhint Removing camera powerhint for verification Bug: 206893843 Test: tested locally Change-Id: I0e10d03cd6ee477620fc4c5075cbe07613d89a58 --- powerhint.json | 54 -------------------------------------------------- 1 file changed, 54 deletions(-) diff --git a/powerhint.json b/powerhint.json index 1d5b351..9fb5732 100644 --- a/powerhint.json +++ b/powerhint.json @@ -722,42 +722,6 @@ "Duration": 2000, "Value": "0" }, - { - "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "984000" - }, - { - "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", - "Node": "CPUMidClusterMaxFreq", - "Duration": 1000, - "Value": "1024000" - }, - { - "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", - "Node": "CPULittleClusterMaxFreq", - "Duration": 1000, - "Value": "1098000" - }, - { - "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "1426000" - }, - { - "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", - "Node": "CPUMidClusterMaxFreq", - "Duration": 1000, - "Value": "1197000" - }, - { - "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", - "Node": "CPULittleClusterMaxFreq", - "Duration": 1000, - "Value": "1401000" - }, { "PowerHint": "CAMERA_SHOT", "Node": "MemFreq", @@ -1058,24 +1022,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUBigClusterMaxFreq", - "Duration": 0, - "Value": "1826000" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPUMidClusterMaxFreq", - "Duration": 0, - "Value": "1491000" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CPULittleClusterMaxFreq", - "Duration": 0, - "Value": "1401000" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "MemFreq", From 1a722f95d96363774196d24f8bc602d76840d99b Mon Sep 17 00:00:00 2001 From: Christine Franks Date: Thu, 12 Jan 2023 15:19:19 -0800 Subject: [PATCH 5/5] Update low light and strong mode DWB values Bug: 243717330 Test: n/a Change-Id: Id810d4b2ab2bc1d9984540d5fd160c454b7de545 --- .../overlay/frameworks/base/core/res/res/values/config.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml index 87e04df..57e35a6 100644 --- a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml +++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml @@ -96,7 +96,6 @@ The same as config_displayWhiteBalanceAmbientColorTemperatures, but with a stronger visual adjustment. --> - 2500 3000 3500 4000 @@ -114,7 +113,6 @@ The same as config_displayWhiteBalanceDisplayColorTemperatures, but with a stronger visual adjustment. --> - 3500 4000 4600 5400 @@ -243,7 +241,7 @@ The ambient color temperature (in cct) to which we interpolates towards to when the ambient brightness is within the low light range, see config_displayWhiteBalanceLowLightAmbientBrightnesses. --> - 3500.0 + 4000.0