From a7ea054ee14143e67300c18877d374a0d7d0bfda Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Thu, 26 Oct 2023 09:54:49 -0700
Subject: [PATCH] caimito(nfc): Modify NFC overlays for NFC apex

Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: Ia66d07db269abcf841262c1af4919c0931e6ad42
---
 caiman/rro_overlays/NfcOverlay/Android.bp     |  9 +++++++
 .../NfcOverlay/AndroidManifest.xml            | 27 +++++++++++++++++++
 caiman/rro_overlays/NfcOverlay/OWNERS         |  2 ++
 .../NfcOverlay}/res/values/config.xml         |  0
 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         |  0
 tokay/rro_overlays/NfcOverlay/Android.bp      |  9 +++++++
 .../NfcOverlay/AndroidManifest.xml            | 27 +++++++++++++++++++
 tokay/rro_overlays/NfcOverlay/OWNERS          |  2 ++
 .../NfcOverlay}/res/values/config.xml         |  0
 15 files changed, 120 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
 rename caiman/{overlay/packages/apps/Nfc => rro_overlays/NfcOverlay}/res/values/config.xml (100%)
 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
 rename komodo/{overlay/packages/apps/Nfc => rro_overlays/NfcOverlay}/res/values/config.xml (100%)
 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
 rename tokay/{overlay/packages/apps/Nfc => rro_overlays/NfcOverlay}/res/values/config.xml (100%)

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/overlay/packages/apps/Nfc/res/values/config.xml b/caiman/rro_overlays/NfcOverlay/res/values/config.xml
similarity index 100%
rename from caiman/overlay/packages/apps/Nfc/res/values/config.xml
rename to caiman/rro_overlays/NfcOverlay/res/values/config.xml
diff --git a/device-caiman.mk b/device-caiman.mk
index 3c1f1b93..ff778257 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -71,7 +71,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	com.android.nfcservices \
 	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 4f2a0ceb..f4fba4f4 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -82,7 +82,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	com.android.nfcservices \
 	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 978ff747..ea285d70 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -73,7 +73,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	com.android.nfcservices \
 	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/overlay/packages/apps/Nfc/res/values/config.xml b/komodo/rro_overlays/NfcOverlay/res/values/config.xml
similarity index 100%
rename from komodo/overlay/packages/apps/Nfc/res/values/config.xml
rename to komodo/rro_overlays/NfcOverlay/res/values/config.xml
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/overlay/packages/apps/Nfc/res/values/config.xml b/tokay/rro_overlays/NfcOverlay/res/values/config.xml
similarity index 100%
rename from tokay/overlay/packages/apps/Nfc/res/values/config.xml
rename to tokay/rro_overlays/NfcOverlay/res/values/config.xml