diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-11 22:40:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-11 22:40:20 +0000 |
commit | 3fa4484d18068a36c995b3b64f1ce44376822048 (patch) | |
tree | ae1ed13300680e2f4ea069aee4d3d7bbfe02bcf7 | |
parent | 3a2357684e8938c7ed22b8c6d323523a50ddbc61 (diff) | |
parent | 4b4315b16e79d4afbd81514a9bb8ae60cf5fc611 (diff) | |
download | coral-3fa4484d18068a36c995b3b64f1ce44376822048.tar.gz |
Merge "Revert^2 "coral(nfc): Modify NFC overlays for NFC apex"" into main am: 85c74b672e am: 4b4315b16e
Original change: https://android-review.googlesource.com/c/device/google/coral/+/2863586
Change-Id: Id0b65e8e00cdcb868352bb8d2a790473c3563cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | device.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 | 29 |
5 files changed, 69 insertions, 1 deletions
@@ -450,7 +450,8 @@ PRODUCT_PACKAGES += \ Tag \ SecureElement \ android.hardware.nfc-service.st \ - android.hardware.secure_element@1.0-service.st + android.hardware.secure_element@1.0-service.st \ + NfcOverlayCoral PRODUCT_COPY_FILES += \ device/google/coral/nfc/com.google.hardware.pixel.japan.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_G020N/com.google.hardware.pixel.japan.xml \ diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 00000000..7e56cd7b --- /dev/null +++ b/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_coral_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayCoral", + 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 00000000..5241aa4a --- /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 00000000..35e9713f --- /dev/null +++ b/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 00000000..959bbed0 --- /dev/null +++ b/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2019 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. +--> +<resources> + <bool name="enable_antenna_blocked_alert">false</bool> + <integer name="max_antenna_blocked_failure_count">10</integer> + <integer name="unknown_tag_polling_delay">2000</integer> + <string name="antenna_blocked_alert_link" translatable="false">https://support.google.com/pixelphone?p=nfc_tag_notification</string> + <string-array name="config_skuSupportsSecureNfc" translatable="false"> + <item>G020J</item> + <item>G020P</item> + <item>G020Q</item> + <item>G020I</item> + <item>G020M</item> + <item>G020N</item> + </string-array> +</resources> |