diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-30 20:39:35 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-30 20:39:35 +0000 |
commit | 130caf86e461c1e13cc4df8cc55c2870e1671305 (patch) | |
tree | 483f9ae75da5801148e372b30283ba41a4000c37 | |
parent | c8a531f5e179d2f898b57208f4e2482d552ebaad (diff) | |
parent | e952e3165a791e9a3032466337ae3d84449c53ca (diff) | |
download | lynx-130caf86e461c1e13cc4df8cc55c2870e1671305.tar.gz |
Snap for 11024862 from e952e3165a791e9a3032466337ae3d84449c53ca to simpleperf-release
Change-Id: I4b108de076863c55bc37549085562f626b6e854b
-rw-r--r-- | device-lynx.mk | 3 | ||||
-rw-r--r-- | rro_overlays/NfcOverlay/Android.bp | 9 | ||||
-rw-r--r-- | rro_overlays/NfcOverlay/AndroidManifest.xml | 27 | ||||
-rw-r--r-- | rro_overlays/NfcOverlay/OWNERS | 2 | ||||
-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 ea17b2e..3f621b7 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 |