From 67f4f2b94c25654c6b8d4c46df4e3549d18b957a Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Fri, 1 Dec 2023 19:19:56 +0000
Subject: [PATCH 1/2] Revert^2 "comet: Replace NFC app with NFC apex"

838f3ff3f273d0c8d7a26f96d805ff86efd20c0c

Bug: 303286040
Test: Compiles

Change-Id: Ie0af88f46ca731bbde14be57656b33ea5661c9f3
---
 device-comet.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-comet.mk b/device-comet.mk
index 6117fc1..6e50a01 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -78,7 +78,7 @@ PRODUCT_COPY_FILES += \
 	device/google/comet/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
 	android.hardware.nfc-service.st
 

From 4fc5c2210508f24d8e605eca3b4b9745a7451e88 Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Fri, 1 Dec 2023 19:19:56 +0000
Subject: [PATCH 2/2] Revert^2 "comet(nfc): Modify NFC overlays for NFC apex"

fffed73cbeeee27b9457ad7df576d1fda289e618

Bug: 303286040
Test: Compiles

Change-Id: Ia9533b0e3c85c36266d1299e78dffb7f8d651486
---
 device-comet.mk                               |  3 ++-
 rro_overlays/NfcOverlay/Android.bp            |  9 +++++++
 rro_overlays/NfcOverlay/AndroidManifest.xml   | 27 +++++++++++++++++++
 rro_overlays/NfcOverlay/OWNERS                |  2 ++
 rro_overlays/NfcOverlay/res/values/config.xml | 24 +++++++++++++++++
 5 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 rro_overlays/NfcOverlay/Android.bp
 create mode 100644 rro_overlays/NfcOverlay/AndroidManifest.xml
 create mode 100644 rro_overlays/NfcOverlay/OWNERS
 create mode 100644 rro_overlays/NfcOverlay/res/values/config.xml

diff --git a/device-comet.mk b/device-comet.mk
index 6e50a01..b444d82 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -80,7 +80,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
-	android.hardware.nfc-service.st
+	android.hardware.nfc-service.st \
+	NfcOverlayComet
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 0000000..8d26426
--- /dev/null
+++ b/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+    default_applicable_licenses: ["device_google_comet_license"],
+}
+
+runtime_resource_overlay {
+    name: "NfcOverlayComet",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/rro_overlays/NfcOverlay/AndroidManifest.xml b/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..5241aa4
--- /dev/null
+++ b/rro_overlays/NfcOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!-- Pixel specific nfc overlays -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.nfc.overlay"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.nfc"
+      android:targetName="NfcCustomization"
+      android:isStatic="true"
+      android:priority="0"/>
+</manifest>
diff --git a/rro_overlays/NfcOverlay/OWNERS b/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 0000000..35e9713
--- /dev/null
+++ b/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 0000000..3b8b458
--- /dev/null
+++ b/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <bool name="nfcc_always_on_allowed">false</bool>
+  <bool name="polling_disable_allowed">false</bool>
+  <string-array name="config_skuSupportsSecureNfc" translatable="false">
+    <item>GGH2X</item>
+    <item>GC15S</item>
+  </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
+</resources>