summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-06-10 06:43:18 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-06-10 06:43:18 +0000
commitd69b7e57b289f7568157448967cfef47fd234d44 (patch)
treeb2857217635cdb6c8f47d50c9c62adaa297d724a
parent76637333dbb5dca098cc4310eb97924f9649b448 (diff)
parentab97fa70d742760a14f73a651b99d2641a1ae348 (diff)
downloadfelix-android13-qpr3-c-s3-release.tar.gz
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23242222', 'googleplex-android-review.googlesource.com/23341876', 'googleplex-android-review.googlesource.com/23341877', 'googleplex-android-review.googlesource.com/23401198', 'googleplex-android-review.googlesource.com/23425557', 'googleplex-android-review.googlesource.com/23443369'] into sparse-10133821-L66000000961199207.android-13.0.0_r60android13-qpr3-c-s3-release
SPARSE_CHANGE: Iac3e857c1c1bd2ceda0f111798a18daf869d8e04 SPARSE_CHANGE: I49536497997e4c81caac6fc5eaec9de52b771863 SPARSE_CHANGE: I2f4da49583a7f66ed9bf58e1f934ba37e61b8586 SPARSE_CHANGE: Ia1523d9c7795dc93a56b4fd57735de9285d396bb SPARSE_CHANGE: I8e425674276ea4c2a12f431a5e10d178e54d81e2 SPARSE_CHANGE: I7c3354b0832668c1d721d085f39434cd328e045a Change-Id: I05920cc00451119b4b1b89e9a39561b908901d71
Diffstat
-rw-r--r--device-felix.mk2
-rw-r--r--thermal_info_config_charge_felix.json37
-rw-r--r--thermal_info_config_felix.json37
-rw-r--r--thermal_info_config_proactive_skin_felix.json37
4 files changed, 25 insertions, 88 deletions
diff --git a/device-felix.mk b/device-felix.mk
index 361fca2..9da068e 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -197,7 +197,7 @@ PRODUCT_SOONG_NAMESPACES += \
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=6
+ ro.vendor.build.svn=11
# Vibrator HAL
PRODUCT_VENDOR_PROPERTIES +=\
diff --git a/thermal_info_config_charge_felix.json b/thermal_info_config_charge_felix.json
index ca67d3d..ceb9181 100644
--- a/thermal_info_config_charge_felix.json
+++ b/thermal_info_config_charge_felix.json
@@ -80,35 +80,14 @@
"Multiplier":1
},
{
- "Name":"CLOSE-SUB1-RAW",
- "Type":"UNKNOWN",
- "Hidden":true,
- "VirtualSensor":true,
- "Formula":"WEIGHTED_AVG",
- "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm"],
- "Coefficient":[-0.15, -0.45, 0.2, 1.5],
- "Offset":-670,
- "Multiplier":0.001
- },
- {
- "Name":"CLOSE-SUB1",
- "Type":"UNKNOWN",
- "Hidden":true,
- "VirtualSensor":true,
- "Formula":"MINIMUM",
- "Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
- "Coefficient":[1.0, 49000.0],
- "Multiplier":0.001
- },
- {
"Name":"CLOSE-SUB2",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
- "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm", "gnss_tcxo_therm"],
- "Coefficient":[0.3, 0.3, -0.1, 0.4, 0.1],
- "Offset":2500,
+ "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "gnss_tcxo_therm"],
+ "Coefficient":[0.259, 0.652, -0.161, 0.03],
+ "Offset":8450,
"Multiplier":0.001
},
{
@@ -161,8 +140,8 @@
"Hidden":true,
"VirtualSensor":true,
"Formula":"MAXIMUM",
- "Combination":["CLOSE-SUB1", "CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
- "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
+ "Combination":["CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
+ "Coefficient":[1.0, 1.0, 1.0, 1.0],
"Multiplier":0.001
},
{
@@ -192,9 +171,9 @@
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
- "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
- "Coefficient":[-0.15, -1.05, 0.1, 0.25, 1.85, 0.05],
- "Offset":-990,
+ "Combination":["skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
+ "Coefficient":[0.385, 0.075, 0.348, 0.302],
+ "Offset":-4950,
"Multiplier":0.001
},
{
diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json
index 775e60f..dd844ba 100644
--- a/thermal_info_config_felix.json
+++ b/thermal_info_config_felix.json
@@ -86,35 +86,14 @@
"Multiplier":1
},
{
- "Name":"CLOSE-SUB1-RAW",
- "Type":"UNKNOWN",
- "Hidden":true,
- "VirtualSensor":true,
- "Formula":"WEIGHTED_AVG",
- "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm"],
- "Coefficient":[-0.15, -0.45, 0.2, 1.5],
- "Offset":-670,
- "Multiplier":0.001
- },
- {
- "Name":"CLOSE-SUB1",
- "Type":"UNKNOWN",
- "Hidden":true,
- "VirtualSensor":true,
- "Formula":"MINIMUM",
- "Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
- "Coefficient":[1.0, 49000.0],
- "Multiplier":0.001
- },
- {
"Name":"CLOSE-SUB2",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
- "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm", "gnss_tcxo_therm"],
- "Coefficient":[0.3, 0.3, -0.1, 0.4, 0.1],
- "Offset":2500,
+ "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "gnss_tcxo_therm"],
+ "Coefficient":[0.259, 0.652, -0.161, 0.03],
+ "Offset":8450,
"Multiplier":0.001
},
{
@@ -167,8 +146,8 @@
"Hidden":true,
"VirtualSensor":true,
"Formula":"MAXIMUM",
- "Combination":["CLOSE-SUB1", "CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
- "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
+ "Combination":["CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
+ "Coefficient":[1.0, 1.0, 1.0, 1.0],
"Multiplier":0.001
},
{
@@ -198,9 +177,9 @@
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
- "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
- "Coefficient":[-0.15, -1.05, 0.1, 0.25, 1.85, 0.05],
- "Offset":-990,
+ "Combination":["skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
+ "Coefficient":[0.385, 0.075, 0.348, 0.302],
+ "Offset":-4950,
"Multiplier":0.001
},
{
diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json
index bd7b388..1b7c446 100644
--- a/thermal_info_config_proactive_skin_felix.json
+++ b/thermal_info_config_proactive_skin_felix.json
@@ -86,35 +86,14 @@
"Multiplier":1
},
{
- "Name":"CLOSE-SUB1-RAW",
- "Type":"UNKNOWN",
- "Hidden":true,
- "VirtualSensor":true,
- "Formula":"WEIGHTED_AVG",
- "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm"],
- "Coefficient":[-0.15, -0.45, 0.2, 1.5],
- "Offset":-670,
- "Multiplier":0.001
- },
- {
- "Name":"CLOSE-SUB1",
- "Type":"UNKNOWN",
- "Hidden":true,
- "VirtualSensor":true,
- "Formula":"MINIMUM",
- "Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
- "Coefficient":[1.0, 49000.0],
- "Multiplier":0.001
- },
- {
"Name":"CLOSE-SUB2",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
- "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm", "gnss_tcxo_therm"],
- "Coefficient":[0.3, 0.3, -0.1, 0.4, 0.1],
- "Offset":2500,
+ "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "gnss_tcxo_therm"],
+ "Coefficient":[0.259, 0.652, -0.161, 0.03],
+ "Offset":8450,
"Multiplier":0.001
},
{
@@ -167,8 +146,8 @@
"Hidden":true,
"VirtualSensor":true,
"Formula":"MAXIMUM",
- "Combination":["CLOSE-SUB1", "CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
- "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
+ "Combination":["CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
+ "Coefficient":[1.0, 1.0, 1.0, 1.0],
"Multiplier":0.001
},
{
@@ -198,9 +177,9 @@
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
- "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
- "Coefficient":[-0.15, -1.05, 0.1, 0.25, 1.85, 0.05],
- "Offset":-990,
+ "Combination":["skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
+ "Coefficient":[0.385, 0.075, 0.348, 0.302],
+ "Offset":-4950,
"Multiplier":0.001
},
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 08:06:12 +0000