diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-07 00:01:59 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-07 00:01:59 +0000 |
commit | 3ffcc35a735cd78ec9bce2bc50fc6835e7702d1a (patch) | |
tree | 13e5ee5e123179971125ec8bcfcc7e1eec002cbc | |
parent | ca73093902a96947b1d9adfd77a3b248b519f332 (diff) | |
parent | 7777a61a891357a9e50ca21d9b6ac730647dc995 (diff) | |
download | felix-3ffcc35a735cd78ec9bce2bc50fc6835e7702d1a.tar.gz |
Snap for 11186783 from 7777a61a891357a9e50ca21d9b6ac730647dc995 to 24Q1-release
Change-Id: I502dd165cb1ab2af7eaa44e6f8417f1812f36e32
-rw-r--r-- | device-felix.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 | 35 |
5 files changed, 76 insertions, 2 deletions
diff --git a/device-felix.mk b/device-felix.mk index 11d4fe9..2e36329 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -100,9 +100,10 @@ PRODUCT_COPY_FILES += \ device/google/felix/nfc/libnfc-nci-felix.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayFelix # SecureElement PRODUCT_PACKAGES += \ diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..580f845 --- /dev/null +++ b/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_felix_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayFelix", + 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/rro_overlays/NfcOverlay/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..5e89b28 --- /dev/null +++ b/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2021 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="nfcc_always_on_allowed">true</bool> + <string-array name="config_skuSupportsSecureNfc" translatable="false"> + <item>G9FPL</item> + <item>G0B96</item> + </string-array> + <bool name="tag_intent_app_pref_supported">true</bool> + <!-- NFC Antenna Location API --> + <integer name="device_width">160</integer> + <integer name="device_height">140</integer> + <bool name="device_foldable">true</bool> + <integer-array name="antenna_x"> + <item>90</item> + <item>30</item> + </integer-array> + <integer-array name="antenna_y"> + <item>103</item> + <item>103</item> + </integer-array> +</resources> |