From 75f62049e59b11344de8463a392bb19718568a83 Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Mon, 16 Jan 2023 14:37:07 +0800
Subject: [PATCH 1/2] thermal: align the gxp throttling policy with P22

Bug: 265609046
Test: verified by emul_temp
Change-Id: If5f4ee86e11a4b430223dcf000f114e9d513eb51
---
 thermal_info_config_lynx.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/thermal_info_config_lynx.json b/thermal_info_config_lynx.json
index 3b63011..961a207 100644
--- a/thermal_info_config_lynx.json
+++ b/thermal_info_config_lynx.json
@@ -124,6 +124,10 @@
                 {
                     "CdevRequest": "tpu_cooling",
                     "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
+                },
+                {
+                    "CdevRequest": "gxp-cooling",
+                    "LimitInfo": [0, 0, 0, 0, 0, 99, 99]
                 }
             ]
         },
@@ -807,6 +811,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 509fbf31c06c4d23fe422bd12fd984908123289e Mon Sep 17 00:00:00 2001
From: George <georgekgchang@google.com>
Date: Wed, 1 Feb 2023 18:03:21 +0800
Subject: [PATCH 2/2] [NFC] Set tag_intent_app_pref_supported

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

diff --git a/lynx/overlay/packages/apps/Nfc/res/values/config.xml b/lynx/overlay/packages/apps/Nfc/res/values/config.xml
index 34bf74e..8c96d35 100644
--- a/lynx/overlay/packages/apps/Nfc/res/values/config.xml
+++ b/lynx/overlay/packages/apps/Nfc/res/values/config.xml
@@ -21,4 +21,5 @@
     <item>GHL1X</item>
     <item>G82U8</item>
   </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
 </resources>