From 422f737c4bc5c9e98302c32e574620b37613ec18 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 25 Oct 2023 14:38:06 -0700 Subject: [PATCH] felix(nfc): Modify NFC overlays for NFC apex Bug: 307763519 Test: Manual flash and tested the overlay values are taking effect. Change-Id: I4c02990bf44fb5f8de360572f1b15ae6f70520ff --- device-felix.mk | 3 ++- rro_overlays/NfcOverlay/Android.bp | 9 +++++++ rro_overlays/NfcOverlay/AndroidManifest.xml | 27 +++++++++++++++++++ rro_overlays/NfcOverlay/OWNERS | 2 ++ .../NfcOverlay}/res/values/config.xml | 0 5 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 rro_overlays/NfcOverlay/Android.bp create mode 100644 rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 rro_overlays/NfcOverlay/OWNERS rename {felix/overlay/packages/apps/Nfc => rro_overlays/NfcOverlay}/res/values/config.xml (100%) diff --git a/device-felix.mk b/device-felix.mk index 765073d..94f9801 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -99,7 +99,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ com.android.nfcservices \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayFelix # SecureElement PRODUCT_PACKAGES += \ diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..580f845 --- /dev/null +++ b/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_felix_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayFelix", + sdk_version: "current", + product_specific: true +} diff --git a/rro_overlays/NfcOverlay/AndroidManifest.xml b/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/rro_overlays/NfcOverlay/OWNERS b/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/felix/overlay/packages/apps/Nfc/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml similarity index 100% rename from felix/overlay/packages/apps/Nfc/res/values/config.xml rename to rro_overlays/NfcOverlay/res/values/config.xml