From a320a803f7d7f7e6e1b0cf025ba5c075a786e083 Mon Sep 17 00:00:00 2001
From: Kyle Hsiao <kylehsiao@google.com>
Date: Thu, 18 Apr 2024 03:26:14 +0000
Subject: [PATCH] Enable secure NFC support

Bug: 335536626
Test: manual
Change-Id: I0197cdde73f5a96581e7dff09c146aac53a9e221
---
 rro_overlays/NfcOverlay/res/values/config.xml        | 6 +-----
 tegu/overlay/packages/apps/Nfc/res/values/config.xml | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml
index 2036ad5..8b4b493 100644
--- a/rro_overlays/NfcOverlay/res/values/config.xml
+++ b/rro_overlays/NfcOverlay/res/values/config.xml
@@ -16,11 +16,7 @@
 <resources>
   <bool name="nfcc_always_on_allowed">false</bool>
   <bool name="polling_disable_allowed">true</bool>
-  <string-array name="config_skuSupportsSecureNfc" translatable="false">
-    <item>GR83Y</item>
-    <item>GEC77</item>
-    <item>GWVK6</item>
-  </string-array>
   <bool name="tag_intent_app_pref_supported">true</bool>
   <bool name="nfc_observe_mode_supported">true</bool>
+  <bool name="enable_secure_nfc_support">true</bool>
 </resources>
diff --git a/tegu/overlay/packages/apps/Nfc/res/values/config.xml b/tegu/overlay/packages/apps/Nfc/res/values/config.xml
index 5058cfa..cbc3afc 100644
--- a/tegu/overlay/packages/apps/Nfc/res/values/config.xml
+++ b/tegu/overlay/packages/apps/Nfc/res/values/config.xml
@@ -16,10 +16,6 @@
 <resources>
   <bool name="nfcc_always_on_allowed">false</bool>
   <bool name="polling_disable_allowed">true</bool>
-  <string-array name="config_skuSupportsSecureNfc" translatable="false">
-    <item>GR83Y</item>
-    <item>GEC77</item>
-    <item>GWVK6</item>
-  </string-array>
   <bool name="tag_intent_app_pref_supported">true</bool>
+  <bool name="enable_secure_nfc_support">true</bool>
 </resources>