From 099addb63dcf384a73cc5030f65d5a2a69fc08f0 Mon Sep 17 00:00:00 2001
From: SianyiHuang <sianyihuang@google.com>
Date: Fri, 6 May 2022 12:55:20 +0800
Subject: [PATCH 1/4] Config: Update Auto Brightness debounce and ambient
 threshold setting

Bug: 233283720
Test: adb shell dumpsys display and check debounce and ambien threshold
seting

Change-Id: I36cc5cf257869c37304c6525d1965a61da5bd037
---
 .../base/core/res/res/values/config.xml       | 153 +++++++++--------
 .../base/core/res/res/values/config.xml       | 154 ++++++++++--------
 2 files changed, 175 insertions(+), 132 deletions(-)

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 6119f7a..7407121 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
@@ -159,7 +159,7 @@
          when adapting to brighter or darker environments.  This parameter controls how quickly
          brightness changes occur in response to an observed change in light level that exceeds the
          hysteresis threshold. -->
-    <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
+    <integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer>
     <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
 
     <!-- The default refresh rate. We manage this using the peak refresh rate setting. Set this
@@ -188,73 +188,94 @@
     <!-- the number of the max cached processes in the system. -->
     <integer name="config_customizedMaxCachedProcesses">64</integer>
 
-    <integer-array name="config_ambientThresholdLevels">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-        <item>20</item>
-        <item>30</item>
-        <item>40</item>
-        <item>50</item>
-        <item>60</item>
-        <item>70</item>
-        <item>80</item>
-        <item>90</item>
-        <item>100</item>
-    </integer-array>
+<integer-array name="config_ambientThresholdLevels">
+    <item>2</item>
+    <item>3</item>
+    <item>4</item>
+    <item>5</item>
+    <item>6</item>
+    <item>7</item>
+    <item>8</item>
+    <item>9</item>
+    <item>10</item>
+    <item>20</item>
+    <item>30</item>
+    <item>40</item>
+    <item>50</item>
+    <item>60</item>
+    <item>70</item>
+    <item>80</item>
+    <item>90</item>
+    <item>100</item>
+    <item>200</item>
+    <item>300</item>
+    <item>400</item>
+    <item>500</item>
+    <item>1000</item>
+    <item>2000</item>
+    <item>3000</item>
+    <item>4000</item>
+</integer-array>
 
-    <integer-array name="config_ambientBrighteningThresholds">
-        <item>11373</item>
-        <item>5000</item>
-        <item>4333</item>
-        <item>3666</item>
-        <item>3000</item>
-        <item>2760</item>
-        <item>2520</item>
-        <item>2280</item>
-        <item>2040</item>
-        <item>1800</item>
-        <item>800</item>
-        <item>527</item>
-        <item>500</item>
-        <item>470</item>
-        <item>396</item>
-        <item>322</item>
-        <item>248</item>
-        <item>174</item>
-        <item>99</item>
-        <item>99</item>
-    </integer-array>
+<integer-array name="config_ambientBrighteningThresholds">
+    <item>5186</item>
+    <item>4333</item>
+    <item>3666</item>
+    <item>2999</item>
+    <item>2759</item>
+    <item>2519</item>
+    <item>2279</item>
+    <item>2039</item>
+    <item>1799</item>
+    <item>799</item>
+    <item>527</item>
+    <item>499</item>
+    <item>470</item>
+    <item>517</item>
+    <item>565</item>
+    <item>612</item>
+    <item>660</item>
+    <item>708</item>
+    <item>742</item>
+    <item>636</item>
+    <item>582</item>
+    <item>549</item>
+    <item>369</item>
+    <item>294</item>
+    <item>269</item>
+    <item>220</item>
+    <item>220</item>
+</integer-array>
 
-    <integer-array name="config_ambientDarkeningThresholds">
-        <item>853</item>
-        <item>700</item>
-        <item>683</item>
-        <item>666</item>
-        <item>650</item>
-        <item>640</item>
-        <item>630</item>
-        <item>620</item>
-        <item>610</item>
-        <item>600</item>
-        <item>500</item>
-        <item>500</item>
-        <item>440</item>
-        <item>385</item>
-        <item>348</item>
-        <item>311</item>
-        <item>274</item>
-        <item>237</item>
-        <item>200</item>
-        <item>200</item>
-    </integer-array>
+<integer-array name="config_ambientDarkeningThresholds">
+    <item>525</item>
+    <item>683</item>
+    <item>666</item>
+    <item>650</item>
+    <item>640</item>
+    <item>630</item>
+    <item>620</item>
+    <item>610</item>
+    <item>600</item>
+    <item>500</item>
+    <item>500</item>
+    <item>440</item>
+    <item>385</item>
+    <item>382</item>
+    <item>379</item>
+    <item>376</item>
+    <item>373</item>
+    <item>371</item>
+    <item>367</item>
+    <item>387</item>
+    <item>397</item>
+    <item>403</item>
+    <item>380</item>
+    <item>345</item>
+    <item>333</item>
+    <item>283</item>
+    <item>283</item>
+</integer-array>
 
      <!-- The stable device width and height in pixels. If these aren't set to a positive number
           then the device will use the width and height of the default display the first time it's
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 339c260..1605b88 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml
@@ -177,7 +177,7 @@
          when adapting to brighter or darker environments.  This parameter controls how quickly
          brightness changes occur in response to an observed change in light level that exceeds the
          hysteresis threshold. -->
-    <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
+    <integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer>
     <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
 
     <!-- The default refresh rate. We manage this using the peak refresh rate setting. Set this
@@ -206,73 +206,95 @@
     <!-- the number of the max cached processes in the system. -->
     <integer name="config_customizedMaxCachedProcesses">64</integer>
 
-    <integer-array name="config_ambientThresholdLevels">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-        <item>20</item>
-        <item>30</item>
-        <item>40</item>
-        <item>50</item>
-        <item>60</item>
-        <item>70</item>
-        <item>80</item>
-        <item>90</item>
-        <item>100</item>
-    </integer-array>
+<integer-array name="config_ambientThresholdLevels">
+    <item>2</item>
+    <item>3</item>
+    <item>4</item>
+    <item>5</item>
+    <item>6</item>
+    <item>7</item>
+    <item>8</item>
+    <item>9</item>
+    <item>10</item>
+    <item>20</item>
+    <item>30</item>
+    <item>40</item>
+    <item>50</item>
+    <item>60</item>
+    <item>70</item>
+    <item>80</item>
+    <item>90</item>
+    <item>100</item>
+    <item>200</item>
+    <item>300</item>
+    <item>400</item>
+    <item>500</item>
+    <item>1000</item>
+    <item>2000</item>
+    <item>3000</item>
+    <item>4000</item>
+</integer-array>
 
-    <integer-array name="config_ambientBrighteningThresholds">
-        <item>11373</item>
-        <item>5000</item>
-        <item>4333</item>
-        <item>3666</item>
-        <item>3000</item>
-        <item>2760</item>
-        <item>2520</item>
-        <item>2280</item>
-        <item>2040</item>
-        <item>1800</item>
-        <item>800</item>
-        <item>527</item>
-        <item>500</item>
-        <item>470</item>
-        <item>396</item>
-        <item>322</item>
-        <item>248</item>
-        <item>174</item>
-        <item>99</item>
-        <item>99</item>
-    </integer-array>
+<integer-array name="config_ambientBrighteningThresholds">
+    <item>5186</item>
+    <item>4333</item>
+    <item>3666</item>
+    <item>2999</item>
+    <item>2759</item>
+    <item>2519</item>
+    <item>2279</item>
+    <item>2039</item>
+    <item>1799</item>
+    <item>799</item>
+    <item>527</item>
+    <item>499</item>
+    <item>470</item>
+    <item>517</item>
+    <item>565</item>
+    <item>612</item>
+    <item>660</item>
+    <item>708</item>
+    <item>742</item>
+    <item>636</item>
+    <item>582</item>
+    <item>549</item>
+    <item>369</item>
+    <item>294</item>
+    <item>269</item>
+    <item>220</item>
+    <item>220</item>
+</integer-array>
+
+<integer-array name="config_ambientDarkeningThresholds">
+    <item>525</item>
+    <item>683</item>
+    <item>666</item>
+    <item>650</item>
+    <item>640</item>
+    <item>630</item>
+    <item>620</item>
+    <item>610</item>
+    <item>600</item>
+    <item>500</item>
+    <item>500</item>
+    <item>440</item>
+    <item>385</item>
+    <item>382</item>
+    <item>379</item>
+    <item>376</item>
+    <item>373</item>
+    <item>371</item>
+    <item>367</item>
+    <item>387</item>
+    <item>397</item>
+    <item>403</item>
+    <item>380</item>
+    <item>345</item>
+    <item>333</item>
+    <item>283</item>
+    <item>283</item>
+</integer-array>
 
-    <integer-array name="config_ambientDarkeningThresholds">
-        <item>853</item>
-        <item>700</item>
-        <item>683</item>
-        <item>666</item>
-        <item>650</item>
-        <item>640</item>
-        <item>630</item>
-        <item>620</item>
-        <item>610</item>
-        <item>600</item>
-        <item>500</item>
-        <item>500</item>
-        <item>440</item>
-        <item>385</item>
-        <item>348</item>
-        <item>311</item>
-        <item>274</item>
-        <item>237</item>
-        <item>200</item>
-        <item>200</item>
-    </integer-array>
 
     <!-- UDFPS does not support gestures -->
     <bool name="config_fingerprintSupportsGestures">false</bool>

From b9c8c28644d9d9caed2153054024670c2dcb30df Mon Sep 17 00:00:00 2001
From: George Chang <georgekgchang@google.com>
Date: Tue, 24 May 2022 10:18:33 +0800
Subject: [PATCH 2/4] Set sereset property every time at boot

Set it to "reset" in order to reset ST54K eSE at NFC hal init.

Bug: 232204531
Test: check eSE reset process starts at boot
Change-Id: I9f5863f963716ddceabbd540fbde32abec0a38b4
---
 conf/init.pantah.rc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc
index ac43e1a..6ddf9cd 100644
--- a/conf/init.pantah.rc
+++ b/conf/init.pantah.rc
@@ -4,7 +4,6 @@ on init
     # NFC streset tool name
     setprop persist.vendor.nfc.streset libstreset21
     setprop persist.vendor.se.streset libstreset21
-    setprop persist.vendor.se.reset needed
 
 on init && property:ro.vendor.factory=1
     import /vendor/etc/init/hw/init.factory.rc
@@ -72,6 +71,9 @@ on property:ro.boot.hardware.revision=PROTO1.0
 on property:ro.boot.hardware.revision=PROTO1.1
     setprop persist.vendor.nfc.config_file_name libnfc-hal-st-proto1.conf
 
+on post-fs-data
+    setprop persist.vendor.se.reset reset
+
 # Bluetooth
 on post-fs-data
     chown bluetooth system /proc/bluetooth/timesync

From 2435a0c9cdb91aa95cc193c98b2fde31eb42b3b0 Mon Sep 17 00:00:00 2001
From: Sayanna Chandula <sayanna@google.com>
Date: Sat, 14 May 2022 23:25:15 +0000
Subject: [PATCH 3/4] thermal: update virtual coefficients per v0.7

Update P10 virtual coefficients to v0.7 version. No change for C10
coefficients.

Bug: 232569691
Test: Build and boot on device.
Signed-off-by: Sayanna Chandula <sayanna@google.com>
Change-Id: I8b7b5c2b2f1a20f07925b66697632fdc66bdc644
---
 thermal_info_config_cheetah.json |  2 +-
 thermal_info_config_panther.json | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index ccd10b7..6547d12 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -124,7 +124,7 @@
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"0.6",
+            "Version":"0.7",
             "VirtualSensor":true,
             "TriggerSensor":"quiet_therm",
             "Formula":"MAXIMUM",
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index 03f9bd3..12e040c 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -56,14 +56,14 @@
             "PassiveDelay":7000
         },
         {
-            "Name":"VIRTUAL-GNSS-QUIET",
+            "Name":"VIRTUAL-QUIET-QI",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["gnss_tcxo_therm", "quiet_therm"],
-            "Coefficient":[1.3, -0.3],
-            "Offset":-1800,
+            "Combination":["quiet_therm", "qi_therm"],
+            "Coefficient":[0.7, 0.3],
+            "Offset":-500,
             "Multiplier":0.001
         },
         {
@@ -78,14 +78,14 @@
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-GNSS-DISP",
+            "Name":"VIRTUAL-QUIET-DISP",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["gnss_tcxo_therm", "disp_therm"],
-            "Coefficient":[0.9, 0.1],
-            "Offset":-700,
+            "Combination":["quiet_therm", "disp_therm"],
+            "Coefficient":[1.1, -0.1],
+            "Offset":-1500,
             "Multiplier":0.001
         },
         {
@@ -124,11 +124,11 @@
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"0.6",
+            "Version":"0.7",
             "VirtualSensor":true,
             "TriggerSensor":"quiet_therm",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-GNSS-QUIET", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP", "VIRTUAL-NEUTRAL-QUIET"],
+            "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
@@ -154,7 +154,7 @@
             "VirtualSensor":true,
             "TriggerSensor":"quiet_therm",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-GNSS-QUIET", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP", "VIRTUAL-NEUTRAL-QUIET"],
+            "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"],
             "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 39.0, 42.0, 44.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
@@ -258,7 +258,7 @@
             "VirtualSensor":true,
             "TriggerSensor":"quiet_therm",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-GNSS-QUIET", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP", "VIRTUAL-NEUTRAL-QUIET"],
+            "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"],
             "Coefficient":[1.0, 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],

From a7e8dbb927ff64a14c6df233c53e35e21dda7987 Mon Sep 17 00:00:00 2001
From: edyblin <edyblin@google.com>
Date: Thu, 19 May 2022 15:02:59 +0000
Subject: [PATCH 4/4] Update ./DevInfo/Mod model name

Need to set model name to GE2AE and GQML3
Bug: 232495475
Test: Pass at b/232495475#comment7

Change-Id: I21cc02b2a980f493a34bcfcd40117bb827504075
---
 .../packages/apps/OMA-DM/DMService/res/values/config.xml | 9 +++++++++
 .../packages/apps/OMA-DM/DMService/res/values/config.xml | 8 ++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 cheetah/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
 create mode 100644 panther/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml

diff --git a/cheetah/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml b/cheetah/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
new file mode 100644
index 0000000..25ffdf0
--- /dev/null
+++ b/cheetah/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- set this to ./DevInfo/Mod -->
+    <string translatable="false" name="config_devinfo_model">GE2AE</string>
+</resources>
+
diff --git a/panther/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml b/panther/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
new file mode 100644
index 0000000..d673d92
--- /dev/null
+++ b/panther/overlay/packages/apps/OMA-DM/DMService/res/values/config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- set this to ./DevInfo/Mod -->
+    <string translatable="false" name="config_devinfo_model">GQML3</string>
+</resources>