From 95218031ee5e5cf2dc28e14fda35b8cae014b492 Mon Sep 17 00:00:00 2001
From: Edwin Tung <edwintung@google.com>
Date: Thu, 29 Dec 2022 14:49:26 +0800
Subject: [PATCH 1/2] gps: Enable Vzw SUPL OTDOA

Bug: 263852801
Test: OTDOA pass
Change-Id: I94661c7f6b23717a20ebe613ab768b22a5b657a5
---
 location/gps.xml.f10      | 1 +
 location/gps_user.xml.f10 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/location/gps.xml.f10 b/location/gps.xml.f10
index 21635f8..9aa35eb 100644
--- a/location/gps.xml.f10
+++ b/location/gps.xml.f10
@@ -35,6 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.f10 b/location/gps_user.xml.f10
index da6628e..bcd8f1d 100644
--- a/location/gps_user.xml.f10
+++ b/location/gps_user.xml.f10
@@ -34,6 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"

From 64ba8eec26edca216ce273d40a916d88c9190d04 Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Thu, 29 Dec 2022 20:26:32 +0800
Subject: [PATCH 2/2] thermal: refer inner display brightness for VSKIN
 equation

Bug: 263215628
Test: Check VSKIN log with camera + open/close device
Change-Id: I04b8d008e1dfeec129599255eeb1925f402bf43b
---
 thermal_info_config_charge_felix.json         | 17 ++++++-----------
 thermal_info_config_felix.json                | 17 ++++++-----------
 thermal_info_config_proactive_skin_felix.json | 17 ++++++-----------
 3 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/thermal_info_config_charge_felix.json b/thermal_info_config_charge_felix.json
index c33479d..40bac51 100644
--- a/thermal_info_config_charge_felix.json
+++ b/thermal_info_config_charge_felix.json
@@ -55,14 +55,9 @@
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-SKIN-OUTER-INNER",
+            "Name":"inner-disp",
             "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["outer_disp_therm", "inner_disp_therm"],
-            "Coefficient":[2.5, -1.0],
-            "Multiplier":0.001
+            "Multiplier":1
         },
         {
             "Name":"IS_OPEN",
@@ -70,8 +65,8 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
-            "Combination":["VIRTUAL-SKIN-OUTER-INNER"],
-            "Coefficient":[-40000.0],
+            "Combination":["inner-disp"],
+            "Coefficient":[1.0],
             "Multiplier":1
         },
         {
@@ -80,8 +75,8 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
-            "Combination":["VIRTUAL-SKIN-OUTER-INNER"],
-            "Coefficient":[40000.0],
+            "Combination":["inner-disp"],
+            "Coefficient":[-1.0],
             "Multiplier":1
         },
         {
diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json
index ba8ba8c..aa4a99d 100644
--- a/thermal_info_config_felix.json
+++ b/thermal_info_config_felix.json
@@ -61,14 +61,9 @@
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-SKIN-OUTER-INNER",
+            "Name":"inner-disp",
             "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["outer_disp_therm", "inner_disp_therm"],
-            "Coefficient":[2.5, -1.0],
-            "Multiplier":0.001
+            "Multiplier":1
         },
         {
             "Name":"IS_OPEN",
@@ -76,8 +71,8 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
-            "Combination":["VIRTUAL-SKIN-OUTER-INNER"],
-            "Coefficient":[-40000.0],
+            "Combination":["inner-disp"],
+            "Coefficient":[1.0],
             "Multiplier":1
         },
         {
@@ -86,8 +81,8 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
-            "Combination":["VIRTUAL-SKIN-OUTER-INNER"],
-            "Coefficient":[40000.0],
+            "Combination":["inner-disp"],
+            "Coefficient":[-1.0],
             "Multiplier":1
         },
         {
diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json
index 6592877..2bc07a2 100644
--- a/thermal_info_config_proactive_skin_felix.json
+++ b/thermal_info_config_proactive_skin_felix.json
@@ -61,14 +61,9 @@
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-SKIN-OUTER-INNER",
+            "Name":"inner-disp",
             "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["outer_disp_therm", "inner_disp_therm"],
-            "Coefficient":[2.5, -1.0],
-            "Multiplier":0.001
+            "Multiplier":1
         },
         {
             "Name":"IS_OPEN",
@@ -76,8 +71,8 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
-            "Combination":["VIRTUAL-SKIN-OUTER-INNER"],
-            "Coefficient":[-40000.0],
+            "Combination":["inner-disp"],
+            "Coefficient":[1.0],
             "Multiplier":1
         },
         {
@@ -86,8 +81,8 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"COUNT_THRESHOLD",
-            "Combination":["VIRTUAL-SKIN-OUTER-INNER"],
-            "Coefficient":[40000.0],
+            "Combination":["inner-disp"],
+            "Coefficient":[-1.0],
             "Multiplier":1
         },
         {