diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-07 00:02:47 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-07 00:02:47 +0000 |
commit | 0c2470b0e766b7692d38e8ff28dc0b715ff00e0f (patch) | |
tree | e8d074f11bf64932cac3f88d88d5db04c84f918a | |
parent | 00df0364fd489bca6c2b790db4362e9b1e007254 (diff) | |
parent | 34acb968a58e4aefa003cc00fc20699d6d66a0cd (diff) | |
download | sunfish-0c2470b0e766b7692d38e8ff28dc0b715ff00e0f.tar.gz |
Snap for 11186783 from 34acb968a58e4aefa003cc00fc20699d6d66a0cd to 24Q1-release
Change-Id: I5224a06980e8f3989f57203eb13ec45bd0d67a6f
-rw-r--r-- | device.mk | 5 | ||||
-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, 67 insertions, 2 deletions
@@ -443,11 +443,12 @@ PRODUCT_PACKAGES += \ # NFC and Secure Element packages PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ 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> |