From 588b64b3d723c401ffe99740a11ed20a35bef447 Mon Sep 17 00:00:00 2001
From: Luofan Chen <clfbbn@gmail.com>
Date: Fri, 16 Aug 2024 01:00:18 +0000
Subject: [PATCH] vermeer: overlay: Nfc: Add targetName and move to vendor

The overlay policy of the NFC package requires the RRO to be in
vendor/system/product partition, but not odm partition, and the name
"NfcCustomization" should be specified.

Test: Open NFC setting and verify that the secure NFC setting ispresent
Change-Id: Ibc9f4f7167986af386d109079538ebcdf7c0b7a2
---
 overlay/NfcOverlayVermeer/Android.bp          | 2 +-
 overlay/NfcOverlayVermeer/AndroidManifest.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/overlay/NfcOverlayVermeer/Android.bp b/overlay/NfcOverlayVermeer/Android.bp
index aaf35de..818cee8 100644
--- a/overlay/NfcOverlayVermeer/Android.bp
+++ b/overlay/NfcOverlayVermeer/Android.bp
@@ -6,5 +6,5 @@
 
 runtime_resource_overlay {
     name: "NfcOverlayVermeer",
-    device_specific: true,
+    vendor: true,
 }
diff --git a/overlay/NfcOverlayVermeer/AndroidManifest.xml b/overlay/NfcOverlayVermeer/AndroidManifest.xml
index ecf0d37..3f4b89c 100644
--- a/overlay/NfcOverlayVermeer/AndroidManifest.xml
+++ b/overlay/NfcOverlayVermeer/AndroidManifest.xml
@@ -5,6 +5,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.nfc.overlay.mondrian">
     <overlay android:targetPackage="com.android.nfc"
+                   android:targetName="NfcCustomization"
                    android:isStatic="true"
                    android:priority="700"/>
 </manifest>