From 63799dd7b97dec9b9c9a8d056513b547d3818309 Mon Sep 17 00:00:00 2001 From: Jeff Pu Date: Thu, 2 Mar 2023 21:39:07 +0000 Subject: [PATCH 1/2] Remove fingerprint virtual hal from individual pixel device mk files since it is included in common one Bug: 270940857 Test: manual build Change-Id: I1926a4aee69dbaf5febac66252bc829c07d3efe7 --- device-felix.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device-felix.mk b/device-felix.mk index 8378687..6c675aa 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -317,7 +317,3 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) device/google/gs201/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc endif -# Biometrics virtual HAL for e2e testing -PRODUCT_PACKAGES_DEBUG += \ - android.hardware.biometrics.fingerprint-service.example - From e6898a29f3c7e14990740788e591d4d5397b7b0e Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Tue, 13 Dec 2022 14:49:26 +0800 Subject: [PATCH 2/2] thermal: register sensor for thermal diff between right and left inner display Bug: 260663676 Test: adb shell dumpsys thermalservice | grep INNER-PANEL-DIFF Change-Id: I0c1528dab395302d3ccdb84022bc1d7bec9bbf5f --- thermal_info_config_felix.json | 31 +++++++++++++++++++ thermal_info_config_proactive_skin_felix.json | 31 +++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json index 382f5c2..bd60873 100644 --- a/thermal_info_config_felix.json +++ b/thermal_info_config_felix.json @@ -517,6 +517,37 @@ "PollingDelay":300000, "PassiveDelay":7000 }, + { + "Name":"LEFT-INNER-DISPLAY", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["outer_disp_therm"], + "Coefficient":[1.56], + "Offset":-14540, + "Multiplier":0.001 + }, + { + "Name":"RIGHT-INNER-DISPLAY", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"], + "Coefficient":[0.35, -0.2, 0.55, -0.95, 0.35, 0.8], + "Offset":3110, + "Multiplier":0.001 + }, + { + "Name":"INNER-DISPLAY-DIFF", + "Type":"UNKNOWN", + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["LEFT-INNER-DISPLAY", "RIGHT-INNER-DISPLAY"], + "Coefficient":[1.0, -1.0], + "Multiplier":0.001 + }, { "Name":"LITTLE", "Type":"CPU", diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json index bad7e72..87fd988 100644 --- a/thermal_info_config_proactive_skin_felix.json +++ b/thermal_info_config_proactive_skin_felix.json @@ -517,6 +517,37 @@ "PollingDelay":300000, "PassiveDelay":7000 }, + { + "Name":"LEFT-INNER-DISPLAY", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["outer_disp_therm"], + "Coefficient":[1.56], + "Offset":-14540, + "Multiplier":0.001 + }, + { + "Name":"RIGHT-INNER-DISPLAY", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"], + "Coefficient":[0.35, -0.2, 0.55, -0.95, 0.35, 0.8], + "Offset":3110, + "Multiplier":0.001 + }, + { + "Name":"INNER-DISPLAY-DIFF", + "Type":"UNKNOWN", + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["LEFT-INNER-DISPLAY", "RIGHT-INNER-DISPLAY"], + "Coefficient":[1.0, -1.0], + "Multiplier":0.001 + }, { "Name":"LITTLE", "Type":"CPU",