diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-11 22:18:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-11 22:18:10 +0000 |
commit | 7801f4757591a22a8073162aaaa11f30a18eedce (patch) | |
tree | 79faa4cebe4eb351bfce50c8833248b3d26a0abe | |
parent | 2c904e7206bf7a25f393e2106930e1d4033ca43b (diff) | |
parent | 13abc9695d23cfa7f48add0f9faedc2c3e2ff6dc (diff) | |
download | sunfish-7801f4757591a22a8073162aaaa11f30a18eedce.tar.gz |
Merge "Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"" into main am: 13abc9695d
Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863088
Change-Id: I9a0c21df4fc6d054ed7a5d7fc29ccb2480508112
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 | 26 |
5 files changed, 66 insertions, 1 deletions
@@ -447,7 +447,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 \ + NfcOverlaySunfish PRODUCT_COPY_FILES += \ device/google/sunfish/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 00000000..4ba8041e --- /dev/null +++ b/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_sunfish_license"], +} + +runtime_resource_overlay { + name: "NfcOverlaySunfish", + 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..1416e811 --- /dev/null +++ b/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,26 @@ +<?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>G025J</item> + <item>G025N</item> + <item>G025M</item> + </string-array> +</resources> |