From ff1e6d34e119f5403095dc030a92d01041755e86 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Tue, 15 Feb 2022 02:20:24 +0000 Subject: [PATCH 1/7] thermal: enable thermal shutdown Lower thermal shutdown temeprature to 55 degC to renable shutdown for all HW revs and usecases Bug: 204522715 Test: build and boot on device. Run a workload and check thermal shutdown Signed-off-by: Sayanna Chandula Change-Id: I10ca928cf8639f279b9dcb1d609d0bb8c7ed2c29 --- thermal_info_config_cheetah.json | 4 ++-- thermal_info_config_panther.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 5b3d4b1..1f83e59 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -276,7 +276,7 @@ "45", "46.5", "52.0", - "150.0" + "55.0" ], "HotHysteresis":[ 0.0, @@ -335,7 +335,7 @@ "43.0", "45.0", "47.0", - "150.0" + "55.0" ], "HotHysteresis":[ 0.0, diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 9ad6913..d6de4b9 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -302,7 +302,7 @@ "45.0", "46.5", "52.0", - "150.0" + "55.0" ], "HotHysteresis":[ 0.0, @@ -363,7 +363,7 @@ "43.0", "45.0", "47.0", - "150.0" + "55.0" ], "HotHysteresis":[ 0.0, From ab4b15955b07f1172b68ee634797b4192a06fa3b Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Mon, 14 Feb 2022 22:17:46 +0000 Subject: [PATCH 2/7] thermal: enable charging throttling Create a virtual rail POWER_FOR_CHARGING_THROTTLING and bind fcc/dc_icl/wlc_fcc cooling devices with virtual-skin-charge sensor. Bug: 204523879 Test: build and boot on device. Check charging throttling Change-Id: Iffd71c5bb6b8545bb95468b3321bcf57c0b02913 Signed-off-by: Sayanna Chandula --- thermal_info_config_cheetah.json | 58 +++++++++++++++++++++++++++++++- thermal_info_config_panther.json | 58 +++++++++++++++++++++++++++++++- 2 files changed, 114 insertions(+), 2 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 1f83e59..55eef2d 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -354,7 +354,30 @@ "BindedCdevInfo": [ { "CdevRequest": "fcc", - "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + "LimitInfo": [0, 2, 3, 3, 4, 4, 4], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], + "CdevFloorWithPowerLink": [0, 0, 2, 2, 3 ,4 ,4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + }, + { + "CdevRequest": "dc_icl", + "LimitInfo": [0, 1, 2, 3, 4, 4, 4], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 2, 3, 3, 4, 4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + }, + { + "CdevRequest": "wlc_fcc", + "LimitInfo": [0, 3, 3, 4, 5, 5, 5], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 5, 5], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true } ] }, @@ -945,6 +968,14 @@ "Name":"fcc", "Type":"BATTERY" }, + { + "Name":"dc_icl", + "Type":"BATTERY" + }, + { + "Name":"wlc_fcc", + "Type":"BATTERY" + }, { "Name":"tpu_cooling", "Type":"NPU", @@ -984,6 +1015,31 @@ "Name":"S2S_VDD_G3D", "PowerSampleDelay":14000, "PowerSampleCount":5 + }, + { + "Name":"POWER_FOR_CHARGING_THROTTLING", + "VirtualRails":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "VSYS_PWR_MODEM", + "S2M_VDD_CPUCL2", + "S3M_VDD_CPUCL1", + "S4M_VDD_CPUCL0", + "S5M_VDD_INT", + "S1M_VDD_MIF", + "S2S_VDD_G3D" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0" + ], + "PowerSampleDelay":14000, + "PowerSampleCount":5 } ] } diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index d6de4b9..82612ee 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -382,7 +382,30 @@ "BindedCdevInfo": [ { "CdevRequest": "fcc", - "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + "LimitInfo": [0, 2, 3, 3, 4, 4, 4], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], + "CdevFloorWithPowerLink": [0, 0, 2, 2, 4 ,4 ,4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + }, + { + "CdevRequest": "dc_icl", + "LimitInfo": [0, 1, 2, 3, 4, 4, 4], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + }, + { + "CdevRequest": "wlc_fcc", + "LimitInfo": [0, 2, 2, 4, 5, 5, 5], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true } ] }, @@ -973,6 +996,14 @@ "Name":"fcc", "Type":"BATTERY" }, + { + "Name":"dc_icl", + "Type":"BATTERY" + }, + { + "Name":"wlc_fcc", + "Type":"BATTERY" + }, { "Name":"tpu_cooling", "Type":"NPU", @@ -1012,6 +1043,31 @@ "Name":"S2S_VDD_G3D", "PowerSampleDelay":14000, "PowerSampleCount":5 + }, + { + "Name":"POWER_FOR_CHARGING_THROTTLING", + "VirtualRails":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "VSYS_PWR_MODEM", + "S2M_VDD_CPUCL2", + "S3M_VDD_CPUCL1", + "S4M_VDD_CPUCL0", + "S5M_VDD_INT", + "S1M_VDD_MIF", + "S2S_VDD_G3D" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0" + ], + "PowerSampleDelay":14000, + "PowerSampleCount":5 } ] } From 7033338dcf04adcc8ddd236d8075857b6d9a00e3 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Wed, 9 Feb 2022 17:21:23 +0800 Subject: [PATCH 3/7] audio: update AudioExt to 3.0 Bug: 206065000 Test: build pass Signed-off-by: Carter Hsu Change-Id: Ica399a4bd1ff9e97be514455dcebdb05939d1537 --- manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.xml b/manifest.xml index 44cd753..73b4e42 100644 --- a/manifest.xml +++ b/manifest.xml @@ -143,7 +143,7 @@ vendor.google.whitechapel.audio.audioext hwbinder - 2.0 + 3.0 IAudioExt default From db6c57f3966ce948f5c01f2b85fe7aeed242a073 Mon Sep 17 00:00:00 2001 From: Kris Chen Date: Tue, 15 Feb 2022 15:31:30 +0800 Subject: [PATCH 4/7] c10p10: Add config_dozeUdfpsLongPressSensorType Bug: 219382123 Test: sysui has registered the udfps gesture after entering AOD. Change-Id: I872406401b4f849e866cb28e406552074a929f84 --- cheetah/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ panther/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml index f75dff3..2c82b65 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml @@ -147,4 +147,7 @@ ge2ae http://www.gstatic.com/android/sms/GE2AE.xml + + + com.google.sensor.long_press diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml index aa2803f..ee6c6bb 100644 --- a/panther/overlay/frameworks/base/core/res/res/values/config.xml +++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml @@ -146,4 +146,7 @@ gqml3 http://www.gstatic.com/android/sms/GQML3.xml + + + com.google.sensor.long_press From 74d797205aed89409b88e1b24f8c34215faa837b Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Tue, 15 Feb 2022 00:32:46 +0000 Subject: [PATCH 5/7] thermal: enable cellular emergency sensor Add cellular-emergency sensor with same virtual coefficients as virtual-skin, but a 54 degC emergency threshold. Bug: 216391268 Test: build and boot on device. Signed-off-by: Sayanna Chandula Change-Id: I8d6178b228ffaf31b80341efb4a78e681940bb47 --- thermal_info_config_cheetah.json | 40 ++++++++++++++++++++++++++++++++ thermal_info_config_panther.json | 40 ++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 55eef2d..7281a6c 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -381,6 +381,46 @@ } ] }, + { + "Name":"cellular-emergency", + "Type":"POWER_AMPLIFIER", + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":[ + "VIRTUAL-QI-USB", + "VIRTUAL-USB2-QUIET", + "VIRTUAL-QUIET-USB2" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "54.0", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.9, + 0.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.001, + "Monitor":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, { "Name":"LITTLE", "Type":"CPU", diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 82612ee..d500b15 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -409,6 +409,46 @@ } ] }, + { + "Name":"cellular-emergency", + "Type":"POWER_AMPLIFIER", + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":[ + "VIRTUAL-QI-USB", + "VIRTUAL-USB-QUIET", + "VIRTUAL-GNSS-USB2" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "54.0", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.9, + 0.0 + ], + "VrThreshold":"NAN", + "Multiplier":0.001, + "Monitor":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, { "Name":"LITTLE", "Type":"CPU", From 723ea1022f0cdf832be2b07111b9b20c137ffbc2 Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Tue, 15 Feb 2022 09:12:31 -0800 Subject: [PATCH 6/7] uwb: remove calibration script The calibration script will be copied higher level device uwb.mk Bug: 219611318 Test: builds Signed-off-by: Victor Liu Change-Id: I68175f99e063bd196555929fd2c55e848c3c360a --- uwb/uwb_calibration.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index 67439ab..dcc44c1 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -19,4 +19,3 @@ PRODUCT_COPY_FILES += \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-unknown.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-default.conf \ - vendor/qorvo/uwb/aosp/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \ From f2817de6da5124072bd521e8d7c8356f3ee771ff Mon Sep 17 00:00:00 2001 From: shawnlin Date: Tue, 15 Feb 2022 13:35:21 +0800 Subject: [PATCH 7/7] Add no cutout overlay packages for C10 & P10 Bug: 219644611 Test: make Change-Id: I2b021c5e9fc1c1b5f8bf48372b7128644a95b75b --- device-cheetah.mk | 8 ++++++++ device-panther.mk | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index c97eae8..65b2c2d 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -194,3 +194,11 @@ PRODUCT_VENDOR_PROPERTIES += \ # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ ro.gms.dck.eligible_wcc=2 + +# Set support hide display cutout feature +PRODUCT_PRODUCT_PROPERTIES += \ + ro.support_hide_display_cutout=true + +PRODUCT_PACKAGES += \ + NoCutoutOverlay \ + AvoidAppsInCutoutOverlay diff --git a/device-panther.mk b/device-panther.mk index 6401547..85b72a0 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -185,3 +185,11 @@ PRODUCT_VENDOR_PROPERTIES += \ # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ ro.gms.dck.eligible_wcc=2 + +# Set support hide display cutout feature +PRODUCT_PRODUCT_PROPERTIES += \ + ro.support_hide_display_cutout=true + +PRODUCT_PACKAGES += \ + NoCutoutOverlay \ + AvoidAppsInCutoutOverlay