From 61abf7319e10837fcb0868cad3807b8a502cb80b 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 "pantah: Replace NFC app with NFC apex"

3000cdee0ef5284ba9fdc68bcdebedbcceb65b10

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aa3c94e272d388cc559f58faabb85caa2eeef48e)
Merged-In: I4da74311505445715132b84afb557ec7e126abac
Change-Id: I4da74311505445715132b84afb557ec7e126abac

Change-Id: I39f927d3cee2ec84616ecb56704fc2b5d4d4896e
---
 device-cheetah.mk     | 2 +-
 device-cloudripper.mk | 2 +-
 device-panther.mk     | 2 +-
 device-ravenclaw.mk   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/device-cheetah.mk b/device-cheetah.mk
index 01e0dd3..e7b42ee 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -115,7 +115,7 @@ PRODUCT_COPY_FILES += \
 endif
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-cloudripper.mk b/device-cloudripper.mk
index 0a4dfc1..6abb728 100644
--- a/device-cloudripper.mk
+++ b/device-cloudripper.mk
@@ -69,7 +69,7 @@ PRODUCT_COPY_FILES += \
 endif
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-panther.mk b/device-panther.mk
index dde9314..36253be 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -94,7 +94,7 @@ PRODUCT_COPY_FILES += \
 endif
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk
index b3607e7..0f3af6d 100644
--- a/device-ravenclaw.mk
+++ b/device-ravenclaw.mk
@@ -66,7 +66,7 @@ PRODUCT_COPY_FILES += \
     device/google/pantah/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 7ca0bc89820f23b0ee2c0bbe501107381960fb00 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 "pantah(nfc): Modify NFC overlays for NFC apex"

08fbfb05f16c273d2940d2b687a5113990f4a3ea

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2280e6ea3db5e414f1ace9734d3066d9b3eb4654)
Merged-In: I4ea4668bd7de33fa5a6c80b742dab0a6b27b4936
Change-Id: I4ea4668bd7de33fa5a6c80b742dab0a6b27b4936

Change-Id: Ie620addb17b635f30a6d79661cd3f0ded2afe0df
---
 cheetah/rro_overlays/NfcOverlay/Android.bp    |  9 +++++
 .../NfcOverlay/AndroidManifest.xml            | 27 ++++++++++++++
 cheetah/rro_overlays/NfcOverlay/OWNERS        |  2 ++
 .../NfcOverlay/res/values/config.xml          | 35 +++++++++++++++++++
 device-cheetah.mk                             |  3 +-
 device-panther.mk                             |  3 +-
 panther/rro_overlays/NfcOverlay/Android.bp    |  9 +++++
 .../NfcOverlay/AndroidManifest.xml            | 27 ++++++++++++++
 panther/rro_overlays/NfcOverlay/OWNERS        |  2 ++
 .../NfcOverlay/res/values/config.xml          | 35 +++++++++++++++++++
 10 files changed, 150 insertions(+), 2 deletions(-)
 create mode 100644 cheetah/rro_overlays/NfcOverlay/Android.bp
 create mode 100644 cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml
 create mode 100644 cheetah/rro_overlays/NfcOverlay/OWNERS
 create mode 100644 cheetah/rro_overlays/NfcOverlay/res/values/config.xml
 create mode 100644 panther/rro_overlays/NfcOverlay/Android.bp
 create mode 100644 panther/rro_overlays/NfcOverlay/AndroidManifest.xml
 create mode 100644 panther/rro_overlays/NfcOverlay/OWNERS
 create mode 100644 panther/rro_overlays/NfcOverlay/res/values/config.xml

diff --git a/cheetah/rro_overlays/NfcOverlay/Android.bp b/cheetah/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 0000000..83a878d
--- /dev/null
+++ b/cheetah/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+    default_applicable_licenses: ["device_google_pantah_license"],
+}
+
+runtime_resource_overlay {
+    name: "NfcOverlayCheetah",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml b/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..5241aa4
--- /dev/null
+++ b/cheetah/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/cheetah/rro_overlays/NfcOverlay/OWNERS b/cheetah/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 0000000..35e9713
--- /dev/null
+++ b/cheetah/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/cheetah/rro_overlays/NfcOverlay/res/values/config.xml b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 0000000..0055264
--- /dev/null
+++ b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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">true</bool>
+  <bool name="polling_disable_allowed">true</bool>
+  <string-array name="config_skuSupportsSecureNfc" translatable="false">
+    <item>GP4BC</item>
+    <item>GE2AE</item>
+    <item>GFE4J</item>
+  </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
+  <!-- NFC Antenna Location API -->
+  <integer name="device_width">75</integer>
+  <integer name="device_height">160</integer>
+  <bool name="device_foldable">false</bool>
+  <integer-array name="antenna_x">
+    <item>38</item>
+  </integer-array>
+  <integer-array name="antenna_y">
+    <item>100</item>
+  </integer-array>
+</resources>
diff --git a/device-cheetah.mk b/device-cheetah.mk
index e7b42ee..6ce4cf4 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -117,7 +117,8 @@ endif
 PRODUCT_PACKAGES += \
 	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
-	android.hardware.nfc-service.st
+	android.hardware.nfc-service.st \
+	NfcOverlayCheetah
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/device-panther.mk b/device-panther.mk
index 36253be..50fd0c8 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -96,7 +96,8 @@ endif
 PRODUCT_PACKAGES += \
 	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
-	android.hardware.nfc-service.st
+	android.hardware.nfc-service.st \
+	NfcOverlayPanther
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/panther/rro_overlays/NfcOverlay/Android.bp b/panther/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 0000000..a1d3b96
--- /dev/null
+++ b/panther/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+    default_applicable_licenses: ["device_google_pantah_license"],
+}
+
+runtime_resource_overlay {
+    name: "NfcOverlayPanther",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/panther/rro_overlays/NfcOverlay/AndroidManifest.xml b/panther/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..5241aa4
--- /dev/null
+++ b/panther/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/panther/rro_overlays/NfcOverlay/OWNERS b/panther/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 0000000..35e9713
--- /dev/null
+++ b/panther/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/panther/rro_overlays/NfcOverlay/res/values/config.xml b/panther/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 0000000..d5bfd3d
--- /dev/null
+++ b/panther/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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">true</bool>
+  <string-array name="config_skuSupportsSecureNfc" translatable="false">
+    <item>GQML3</item>
+    <item>GVU6C</item>
+    <item>G03Z5</item>
+  </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
+  <!-- NFC Antenna Location API -->
+  <integer name="device_width">70</integer>
+  <integer name="device_height">150</integer>
+  <bool name="device_foldable">false</bool>
+  <integer-array name="antenna_x">
+    <item>38</item>
+  </integer-array>
+  <integer-array name="antenna_y">
+    <item>97</item>
+  </integer-array>
+</resources>