summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2023-10-26 14:33:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-26 14:33:56 +0000
commit2ca631c4214bb0e4bda1e359ad0c2f7cc598f010 (patch)
treef1b9b40e424febb24e696b1756e38e914c6004de
parent2752cdf1abc1adbda589fa3e722dda6a6b9f2704 (diff)
parente952e3165a791e9a3032466337ae3d84449c53ca (diff)
downloadlynx-2ca631c4214bb0e4bda1e359ad0c2f7cc598f010.tar.gz
lynx(nfc): Modify NFC overlays for NFC apex am: e952e3165a
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2803075 Change-Id: I7a621137f0d51d50d2d4d7580e63168f01ba5229 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--device-lynx.mk3
-rw-r--r--rro_overlays/NfcOverlay/Android.bp9
-rw-r--r--rro_overlays/NfcOverlay/AndroidManifest.xml27
-rw-r--r--rro_overlays/NfcOverlay/OWNERS2
-rw-r--r--rro_overlays/NfcOverlay/res/values/config.xml (renamed from lynx/overlay/packages/apps/Nfc/res/values/config.xml)0
5 files changed, 40 insertions, 1 deletions
diff --git a/device-lynx.mk b/device-lynx.mk
index 6669b8d..032bc7f 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -80,7 +80,8 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
com.android.nfcservices \
Tag \
- android.hardware.nfc-service.st
+ android.hardware.nfc-service.st \
+ NfcOverlayLynx
# SecureElement
PRODUCT_PACKAGES += \
diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 0000000..0b3fcb6
--- /dev/null
+++ b/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+ default_applicable_licenses: ["device_google_lynx_license"],
+}
+
+runtime_resource_overlay {
+ name: "NfcOverlayLynx",
+ 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 @@
+<?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/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/lynx/overlay/packages/apps/Nfc/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml
index 4a8efa9..4a8efa9 100644
--- a/lynx/overlay/packages/apps/Nfc/res/values/config.xml
+++ b/rro_overlays/NfcOverlay/res/values/config.xml