From 2fd48aa99ee08687504e9c33b4f8c2d1d6b99f8b Mon Sep 17 00:00:00 2001
From: George <georgekgchang@google.com>
Date: Wed, 19 Apr 2023 17:21:35 +0800
Subject: [PATCH] Update NFC customize settings

Add antenna position info for the new NFC API
Update default routing settings and remove legacy settings

Bug: 278829073
Test: manual
Change-Id: Ice6dc1ffce1c9adebf03ccbe8c3d50eb07022186
---
 .../overlay/packages/apps/Nfc/res/values/config.xml  | 12 +++++++++++-
 nfc/libnfc-hal-st.conf                               |  2 +-
 nfc/libnfc-nci.conf                                  |  2 +-
 .../overlay/packages/apps/Nfc/res/values/config.xml  | 10 ++++++++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/husky/overlay/packages/apps/Nfc/res/values/config.xml b/husky/overlay/packages/apps/Nfc/res/values/config.xml
index 844d8d0..20edf75 100644
--- a/husky/overlay/packages/apps/Nfc/res/values/config.xml
+++ b/husky/overlay/packages/apps/Nfc/res/values/config.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <resources>
-  <bool name="nfcc_always_on_allowed">true</bool>
+  <bool name="nfcc_always_on_allowed">false</bool>
   <bool name="polling_disable_allowed">true</bool>
   <string-array name="config_skuSupportsSecureNfc" translatable="false">
     <item>GC3VE</item>
@@ -22,4 +22,14 @@
     <item>GE9DP</item>
   </string-array>
   <bool name="tag_intent_app_pref_supported">true</bool>
+  <!-- NFC Antenna Location API -->
+  <integer name="device_width">73</integer>
+  <integer name="device_height">158</integer>
+  <bool name="device_foldable">false</bool>
+  <integer-array name="antenna_x">
+    <item>37</item>
+  </integer-array>
+  <integer-array name="antenna_y">
+    <item>103</item>
+  </integer-array>
 </resources>
diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf
index f85b98a..2700a20 100644
--- a/nfc/libnfc-hal-st.conf
+++ b/nfc/libnfc-hal-st.conf
@@ -139,7 +139,7 @@ OFFHOST_ROUTE_ESE={86}
 # host  0x00
 # eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
 # UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_ISODEP_ROUTE=0x81
+DEFAULT_ISODEP_ROUTE=0x00
 
 ###############################################################################
 # Configure the HAL Clock control
diff --git a/nfc/libnfc-nci.conf b/nfc/libnfc-nci.conf
index 3940b1f..be65f66 100644
--- a/nfc/libnfc-nci.conf
+++ b/nfc/libnfc-nci.conf
@@ -118,4 +118,4 @@ RECOVERY_OPTION=1
 # NFCEE Power Supply and Communication Link Control Configuration
 # Set when SetAlwaysOn enabled
 # Default 0x00 when SetAlways on disabled
-ALWAYS_ON_SET_EE_POWER_AND_LINK_CONF=0x03
+ALWAYS_ON_SET_EE_POWER_AND_LINK_CONF=0x00
diff --git a/shiba/overlay/packages/apps/Nfc/res/values/config.xml b/shiba/overlay/packages/apps/Nfc/res/values/config.xml
index 943a466..5bdeca6 100644
--- a/shiba/overlay/packages/apps/Nfc/res/values/config.xml
+++ b/shiba/overlay/packages/apps/Nfc/res/values/config.xml
@@ -22,4 +22,14 @@
     <item>GPJ41</item>
   </string-array>
   <bool name="tag_intent_app_pref_supported">true</bool>
+  <!-- NFC Antenna Location API -->
+  <integer name="device_width">68</integer>
+  <integer name="device_height">146</integer>
+  <bool name="device_foldable">false</bool>
+  <integer-array name="antenna_x">
+    <item>34</item>
+  </integer-array>
+  <integer-array name="antenna_y">
+    <item>97</item>
+  </integer-array>
 </resources>