From 3b1c2774708572c195a520987cf82896eb54e961 Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Wed, 25 Oct 2023 14:21:09 -0700
Subject: [PATCH] pantah(nfc): Modify NFC overlays for NFC apex

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

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/overlay/packages/apps/Nfc/res/values/config.xml b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml
similarity index 100%
rename from cheetah/overlay/packages/apps/Nfc/res/values/config.xml
rename to cheetah/rro_overlays/NfcOverlay/res/values/config.xml
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 2f4784b..d14d754 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -117,7 +117,8 @@ endif
 PRODUCT_PACKAGES += \
 	com.android.nfcservices \
 	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 bc29bc5..36c669f 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -96,7 +96,8 @@ endif
 PRODUCT_PACKAGES += \
 	com.android.nfcservices \
 	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/overlay/packages/apps/Nfc/res/values/config.xml b/panther/rro_overlays/NfcOverlay/res/values/config.xml
similarity index 100%
rename from panther/overlay/packages/apps/Nfc/res/values/config.xml
rename to panther/rro_overlays/NfcOverlay/res/values/config.xml