From 3c095fde62a98f024f6fffade04f1ae0f6d08c6c 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 "caimito: Replace NFC app with NFC apex"

2b80687bd54ea455747e83e3718935266cf24107

Bug: 303286040
Test: Compiles

Change-Id: I6101ace993aeb3401293336c93f1275df0c23872
---
 device-caiman.mk        | 2 +-
 device-komodo.mk        | 2 +-
 device-ripcurrent24.mk  | 2 +-
 device-ripcurrentpro.mk | 2 +-
 device-tokay.mk         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/device-caiman.mk b/device-caiman.mk
index b115970b..b8cbcfa1 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \
 	device/google/caimito/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
 
diff --git a/device-komodo.mk b/device-komodo.mk
index 4aad00bd..49a0acfa 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -80,7 +80,7 @@ PRODUCT_COPY_FILES += \
 	device/google/caimito/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
 
diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk
index 21544e88..3d4ac419 100644
--- a/device-ripcurrent24.mk
+++ b/device-ripcurrent24.mk
@@ -61,7 +61,7 @@ PRODUCT_COPY_FILES += \
 	device/google/caimito/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
 
diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk
index c45b3645..90caa35a 100644
--- a/device-ripcurrentpro.mk
+++ b/device-ripcurrentpro.mk
@@ -62,7 +62,7 @@ PRODUCT_COPY_FILES += \
 	device/google/caimito/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
 
diff --git a/device-tokay.mk b/device-tokay.mk
index 8af6060b..886a6879 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -71,7 +71,7 @@ PRODUCT_COPY_FILES += \
 	device/google/caimito/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 90cc5a72683af9bc35c29977b29252ce2ff1a564 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 "caimito(nfc): Modify NFC overlays for NFC apex"

48310e655fad7da8bd56604bd69e2197927338e8

Bug: 303286040
Test: Compiles

Change-Id: I9afc09e08ee6c83f0b95ad1e4fd479e081a90c9c
---
 caiman/rro_overlays/NfcOverlay/Android.bp     |  9 +++++++
 .../NfcOverlay/AndroidManifest.xml            | 27 +++++++++++++++++++
 caiman/rro_overlays/NfcOverlay/OWNERS         |  2 ++
 .../NfcOverlay/res/values/config.xml          | 25 +++++++++++++++++
 device-caiman.mk                              |  3 ++-
 device-komodo.mk                              |  3 ++-
 device-tokay.mk                               |  3 ++-
 komodo/rro_overlays/NfcOverlay/Android.bp     |  9 +++++++
 .../NfcOverlay/AndroidManifest.xml            | 27 +++++++++++++++++++
 komodo/rro_overlays/NfcOverlay/OWNERS         |  2 ++
 .../NfcOverlay/res/values/config.xml          | 25 +++++++++++++++++
 tokay/rro_overlays/NfcOverlay/Android.bp      |  9 +++++++
 .../NfcOverlay/AndroidManifest.xml            | 27 +++++++++++++++++++
 tokay/rro_overlays/NfcOverlay/OWNERS          |  2 ++
 .../NfcOverlay/res/values/config.xml          | 25 +++++++++++++++++
 15 files changed, 195 insertions(+), 3 deletions(-)
 create mode 100644 caiman/rro_overlays/NfcOverlay/Android.bp
 create mode 100644 caiman/rro_overlays/NfcOverlay/AndroidManifest.xml
 create mode 100644 caiman/rro_overlays/NfcOverlay/OWNERS
 create mode 100644 caiman/rro_overlays/NfcOverlay/res/values/config.xml
 create mode 100644 komodo/rro_overlays/NfcOverlay/Android.bp
 create mode 100644 komodo/rro_overlays/NfcOverlay/AndroidManifest.xml
 create mode 100644 komodo/rro_overlays/NfcOverlay/OWNERS
 create mode 100644 komodo/rro_overlays/NfcOverlay/res/values/config.xml
 create mode 100644 tokay/rro_overlays/NfcOverlay/Android.bp
 create mode 100644 tokay/rro_overlays/NfcOverlay/AndroidManifest.xml
 create mode 100644 tokay/rro_overlays/NfcOverlay/OWNERS
 create mode 100644 tokay/rro_overlays/NfcOverlay/res/values/config.xml

diff --git a/caiman/rro_overlays/NfcOverlay/Android.bp b/caiman/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 00000000..c0982559
--- /dev/null
+++ b/caiman/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+    default_applicable_licenses: ["device_google_caimito_license"],
+}
+
+runtime_resource_overlay {
+    name: "NfcOverlayCaiman",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/caiman/rro_overlays/NfcOverlay/AndroidManifest.xml b/caiman/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..5241aa4a
--- /dev/null
+++ b/caiman/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/caiman/rro_overlays/NfcOverlay/OWNERS b/caiman/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 00000000..35e9713f
--- /dev/null
+++ b/caiman/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/caiman/rro_overlays/NfcOverlay/res/values/config.xml b/caiman/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 00000000..5058cfa5
--- /dev/null
+++ b/caiman/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,25 @@
+<?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">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>
+</resources>
diff --git a/device-caiman.mk b/device-caiman.mk
index b8cbcfa1..f838e2f3 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -67,7 +67,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
-	android.hardware.nfc-service.st
+	android.hardware.nfc-service.st \
+	NfcOverlayCaiman
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/device-komodo.mk b/device-komodo.mk
index 49a0acfa..378837ac 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -82,7 +82,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
-	android.hardware.nfc-service.st
+	android.hardware.nfc-service.st \
+	NfcOverlayKomodo
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/device-tokay.mk b/device-tokay.mk
index 886a6879..11d70793 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -73,7 +73,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
-	android.hardware.nfc-service.st
+	android.hardware.nfc-service.st \
+	NfcOverlayTokay
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/komodo/rro_overlays/NfcOverlay/Android.bp b/komodo/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 00000000..8e19ae4b
--- /dev/null
+++ b/komodo/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+    default_applicable_licenses: ["device_google_caimito_license"],
+}
+
+runtime_resource_overlay {
+    name: "NfcOverlayKomodo",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/komodo/rro_overlays/NfcOverlay/AndroidManifest.xml b/komodo/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..5241aa4a
--- /dev/null
+++ b/komodo/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/komodo/rro_overlays/NfcOverlay/OWNERS b/komodo/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 00000000..35e9713f
--- /dev/null
+++ b/komodo/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/komodo/rro_overlays/NfcOverlay/res/values/config.xml b/komodo/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 00000000..265f2c9a
--- /dev/null
+++ b/komodo/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,25 @@
+<?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">true</bool>
+  <string-array name="config_skuSupportsSecureNfc" translatable="false">
+    <item>GGX8B</item>
+    <item>GQ57S</item>
+    <item>GZC4K</item>
+  </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
+</resources>
diff --git a/tokay/rro_overlays/NfcOverlay/Android.bp b/tokay/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 00000000..187416bf
--- /dev/null
+++ b/tokay/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+    default_applicable_licenses: ["device_google_caimito_license"],
+}
+
+runtime_resource_overlay {
+    name: "NfcOverlayTokay",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/tokay/rro_overlays/NfcOverlay/AndroidManifest.xml b/tokay/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..5241aa4a
--- /dev/null
+++ b/tokay/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/tokay/rro_overlays/NfcOverlay/OWNERS b/tokay/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 00000000..35e9713f
--- /dev/null
+++ b/tokay/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/tokay/rro_overlays/NfcOverlay/res/values/config.xml b/tokay/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 00000000..5d908286
--- /dev/null
+++ b/tokay/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,25 @@
+<?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">true</bool>
+  <string-array name="config_skuSupportsSecureNfc" translatable="false">
+    <item>G2YBB</item>
+    <item>GUR25</item>
+    <item>G1B60</item>
+  </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
+</resources>