From 9f1be47cfd8e1c23779dc994e2057b06751c62be Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Wed, 6 Dec 2023 21:32:48 +0000
Subject: Revert^2 "sunfish: Replace NFC app with NFC apex"

ed69a7cc8c2f30a8f375f7fa8c781796e98fb399

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

diff --git a/device.mk b/device.mk
index 64d93e82..9c244b01 100644
--- a/device.mk
+++ b/device.mk
@@ -443,7 +443,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 8b110344775ee58d4a7b2e3894b1c9db34ae418d Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Wed, 6 Dec 2023 21:32:54 +0000
Subject: Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"

0ba612f27f56cabafb15efb78adfca8e565486a0

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:34acb968a58e4aefa003cc00fc20699d6d66a0cd)
Merged-In: I9028f8eae1d973d0f9b7553a6adf9525b56766c9
Change-Id: I9028f8eae1d973d0f9b7553a6adf9525b56766c9
---
 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 | 26 ++++++++++++++++++++++++++
 5 files changed, 66 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 64d93e82..3f366faa 100644
--- a/device.mk
+++ b/device.mk
@@ -447,7 +447,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 \
+    NfcOverlaySunfish
 
 PRODUCT_COPY_FILES += \
     device/google/sunfish/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \
diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 00000000..4ba8041e
--- /dev/null
+++ b/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+    default_applicable_licenses: ["device_google_sunfish_license"],
+}
+
+runtime_resource_overlay {
+    name: "NfcOverlaySunfish",
+    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..1416e811
--- /dev/null
+++ b/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,26 @@
+<?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>G025J</item>
+    <item>G025N</item>
+    <item>G025M</item>
+  </string-array>
+</resources>
-- 
cgit v1.2.3