From a1c43dba6ccdc327b99cca5adacfd4dfd2970ae5 Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Mon, 16 Jan 2023 17:50:56 +0800
Subject: [PATCH 1/3] thermal: align the gxp throttling policy with P22

Bug: 265609046
Test: verified by emul_temp
Change-Id: I8688208c7b9b2830841c8b81dadf5c0cd682b813
---
 thermal_info_config_felix.json                | 9 +++++++++
 thermal_info_config_proactive_skin_felix.json | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json
index 7eb4613..7f68c75 100644
--- a/thermal_info_config_felix.json
+++ b/thermal_info_config_felix.json
@@ -265,6 +265,10 @@
                 {
                     "CdevRequest": "tpu_cooling",
                     "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
+                },
+                {
+                    "CdevRequest": "gxp-cooling",
+                    "LimitInfo": [0, 0, 0, 0, 0, 99, 99]
                 }
             ]
         },
@@ -897,6 +901,11 @@
             "Name":"tpu_cooling",
             "Type":"NPU",
             "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote"
+        },
+        {
+            "Name":"gxp-cooling",
+            "Type":"NPU",
+            "WritePath":"/dev/thermal/cdev-by-name/gxp-cooling/user_vote"
         }
     ],
     "PowerRails":[
diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json
index 41a9321..387cdfb 100644
--- a/thermal_info_config_proactive_skin_felix.json
+++ b/thermal_info_config_proactive_skin_felix.json
@@ -265,6 +265,10 @@
                 {
                     "CdevRequest": "tpu_cooling",
                     "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
+                },
+                {
+                    "CdevRequest": "gxp-cooling",
+                    "LimitInfo": [0, 0, 0, 0, 0, 99, 99]
                 }
             ]
         },
@@ -897,6 +901,11 @@
             "Name":"tpu_cooling",
             "Type":"NPU",
             "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote"
+        },
+        {
+            "Name":"gxp-cooling",
+            "Type":"NPU",
+            "WritePath":"/dev/thermal/cdev-by-name/gxp-cooling/user_vote"
         }
     ],
     "PowerRails":[

From 70d72b17591204805f1d511f2780457948d65f17 Mon Sep 17 00:00:00 2001
From: Carter Hsu <carterhsu@google.com>
Date: Tue, 31 Jan 2023 15:21:14 +0800
Subject: [PATCH 2/3] Update speaker-mic-post setting for increasing gain

Change gain from 0 to 22
    <path name="speaker-mic-post">
    <ctl name="MIC Record Soft Gain (dB)" value="22"/>

Bug: 267236408
Test: Hardware team verified, b/267236408#comment5
Change-Id: Ie90bcf3fb0cdabfa6848f686a542d32126dc33ff
Signed-off-by: Carter Hsu <carterhsu@google.com>
---
 audio/felix/config/mixer_paths.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/audio/felix/config/mixer_paths.xml b/audio/felix/config/mixer_paths.xml
index c9ed428..66bb521 100644
--- a/audio/felix/config/mixer_paths.xml
+++ b/audio/felix/config/mixer_paths.xml
@@ -721,7 +721,7 @@
     </path>
 
     <path name="speaker-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="22"/>
     </path>
 
     <path name="voice-speaker-mic">

From 13fcc02a708caa88784c13ab00c0e55dbffe2f28 Mon Sep 17 00:00:00 2001
From: George <georgekgchang@google.com>
Date: Wed, 1 Feb 2023 18:02:05 +0800
Subject: [PATCH 3/3] [NFC] Set tag_intent_app_pref_supported

Bug: 244272155
Test: atest android.permission.cts.NfcPermissionTest
Test: atest NfcFeatureFlagTest
Change-Id: Ic1d4d97a50231b4ce1d8d0f5cc9d7ba2e134f983
---
 felix/overlay/packages/apps/Nfc/res/values/config.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/felix/overlay/packages/apps/Nfc/res/values/config.xml b/felix/overlay/packages/apps/Nfc/res/values/config.xml
index 348c881..7cb1b6e 100644
--- a/felix/overlay/packages/apps/Nfc/res/values/config.xml
+++ b/felix/overlay/packages/apps/Nfc/res/values/config.xml
@@ -19,4 +19,5 @@
     <item>G9FPL</item>
     <item>G0B96</item>
   </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
 </resources>