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

Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: Ie400238eaf2d1e229ea80bfc4c2f12a5edc79437
---
 device-husky.mk                               |  3 +++
 device-shiba.mk                               |  3 +++
 husky/rro_overlays/NfcOverlay/Android.bp      |  9 +++++++
 .../NfcOverlay/AndroidManifest.xml            | 27 +++++++++++++++++++
 husky/rro_overlays/NfcOverlay/OWNERS          |  2 ++
 .../NfcOverlay}/res/values/config.xml         |  0
 shiba/rro_overlays/NfcOverlay/Android.bp      |  9 +++++++
 .../NfcOverlay/AndroidManifest.xml            | 27 +++++++++++++++++++
 shiba/rro_overlays/NfcOverlay/OWNERS          |  2 ++
 .../NfcOverlay}/res/values/config.xml         |  0
 10 files changed, 82 insertions(+)
 create mode 100644 husky/rro_overlays/NfcOverlay/Android.bp
 create mode 100644 husky/rro_overlays/NfcOverlay/AndroidManifest.xml
 create mode 100644 husky/rro_overlays/NfcOverlay/OWNERS
 rename husky/{overlay/packages/apps/Nfc => rro_overlays/NfcOverlay}/res/values/config.xml (100%)
 create mode 100644 shiba/rro_overlays/NfcOverlay/Android.bp
 create mode 100644 shiba/rro_overlays/NfcOverlay/AndroidManifest.xml
 create mode 100644 shiba/rro_overlays/NfcOverlay/OWNERS
 rename shiba/{overlay/packages/apps/Nfc => rro_overlays/NfcOverlay}/res/values/config.xml (100%)

diff --git a/device-husky.mk b/device-husky.mk
index 9525f68..03ff989 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -427,3 +427,6 @@ PRODUCT_PACKAGES += shusky_assignable_devices.xml
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
     ro.usb.uvc.enabled=true
+
+PRODUCT_PACKAGES += \
+	NfcOverlayHusky \
diff --git a/device-shiba.mk b/device-shiba.mk
index 507fa9c..6b2a4a0 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -393,3 +393,6 @@ PRODUCT_PACKAGES += shusky_assignable_devices.xml
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
     ro.usb.uvc.enabled=true
+
+PRODUCT_PACKAGES += \
+    NfcOverlayShiba
diff --git a/husky/rro_overlays/NfcOverlay/Android.bp b/husky/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 0000000..826630f
--- /dev/null
+++ b/husky/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+    default_applicable_licenses: ["device_google_shusky_license"],
+}
+
+runtime_resource_overlay {
+    name: "NfcOverlayHusky",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/husky/rro_overlays/NfcOverlay/AndroidManifest.xml b/husky/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..5241aa4
--- /dev/null
+++ b/husky/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/husky/rro_overlays/NfcOverlay/OWNERS b/husky/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 0000000..35e9713
--- /dev/null
+++ b/husky/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/husky/overlay/packages/apps/Nfc/res/values/config.xml b/husky/rro_overlays/NfcOverlay/res/values/config.xml
similarity index 100%
rename from husky/overlay/packages/apps/Nfc/res/values/config.xml
rename to husky/rro_overlays/NfcOverlay/res/values/config.xml
diff --git a/shiba/rro_overlays/NfcOverlay/Android.bp b/shiba/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 0000000..065e971
--- /dev/null
+++ b/shiba/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+    default_applicable_licenses: ["device_google_shusky_license"],
+}
+
+runtime_resource_overlay {
+    name: "NfcOverlayShiba",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/shiba/rro_overlays/NfcOverlay/AndroidManifest.xml b/shiba/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..5241aa4
--- /dev/null
+++ b/shiba/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/shiba/rro_overlays/NfcOverlay/OWNERS b/shiba/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 0000000..35e9713
--- /dev/null
+++ b/shiba/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/shiba/overlay/packages/apps/Nfc/res/values/config.xml b/shiba/rro_overlays/NfcOverlay/res/values/config.xml
similarity index 100%
rename from shiba/overlay/packages/apps/Nfc/res/values/config.xml
rename to shiba/rro_overlays/NfcOverlay/res/values/config.xml