From ee2999fa9b10cba4f222bfa546898e70d95fb311 Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Wed, 6 Dec 2023 21:31:11 +0000
Subject: Revert^2 "coral: Replace NFC app with NFC apex"

2c5e9cd2569af264f59bec8354e1ec20636871bb

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c9235a50d0a270c136883a7d7409710bf5dfae31)
Merged-In: I4354c059bd1bf945a62c580dc897855b57bc3c55
Change-Id: I4354c059bd1bf945a62c580dc897855b57bc3c55
---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 0e40ffcc..fef09423 100644
--- a/device.mk
+++ b/device.mk
@@ -446,7 +446,7 @@ PRODUCT_PACKAGES += \
 
 # NFC and Secure Element packages
 PRODUCT_PACKAGES += \
-    NfcNci \
+    $(RELEASE_PACKAGE_NFC_STACK) \
     Tag \
     SecureElement \
     android.hardware.nfc-service.st \
-- 
cgit v1.2.3


From 89bb6d45273c934a93996e48b6399a2dde792b13 Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Wed, 6 Dec 2023 21:31:18 +0000
Subject: Revert^2 "coral(nfc): Modify NFC overlays for NFC apex"

6b92e954f075ec22e678cda5e655a7f77daa8eb4

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b1f3f994e253788582b7d5b48b9fbd8294e62480)
Merged-In: I80a8529cc2ed8755029471e048acc5cbfc955e56
Change-Id: I80a8529cc2ed8755029471e048acc5cbfc955e56
---
 device.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 | 29 +++++++++++++++++++++++++++
 5 files changed, 69 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.mk b/device.mk
index 0e40ffcc..72ee4212 100644
--- a/device.mk
+++ b/device.mk
@@ -450,7 +450,8 @@ PRODUCT_PACKAGES += \
     Tag \
     SecureElement \
     android.hardware.nfc-service.st \
-    android.hardware.secure_element@1.0-service.st
+    android.hardware.secure_element@1.0-service.st \
+    NfcOverlayCoral
 
 PRODUCT_COPY_FILES += \
     device/google/coral/nfc/com.google.hardware.pixel.japan.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_G020N/com.google.hardware.pixel.japan.xml \
diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 00000000..7e56cd7b
--- /dev/null
+++ b/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+    default_applicable_licenses: ["device_google_coral_license"],
+}
+
+runtime_resource_overlay {
+    name: "NfcOverlayCoral",
+    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 00000000..5241aa4a
--- /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 00000000..35e9713f
--- /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 00000000..959bbed0
--- /dev/null
+++ b/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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="enable_antenna_blocked_alert">false</bool>
+  <integer name="max_antenna_blocked_failure_count">10</integer>
+  <integer name="unknown_tag_polling_delay">2000</integer>
+  <string name="antenna_blocked_alert_link" translatable="false">https://support.google.com/pixelphone?p=nfc_tag_notification</string>
+  <string-array name="config_skuSupportsSecureNfc" translatable="false">
+    <item>G020J</item>
+    <item>G020P</item>
+    <item>G020Q</item>
+    <item>G020I</item>
+    <item>G020M</item>
+    <item>G020N</item>
+  </string-array>
+</resources>
-- 
cgit v1.2.3