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 - diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json index 733df89..77036e3 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 c719af2..0008d87 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",