Merge "Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: c9084eb711

Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2863087

Change-Id: Iddeecbf6cb78383913f1c0b39172603e6a4f5798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-12-11 22:18:08 +00:00
committed by Automerger Merge Worker
5 changed files with 79 additions and 0 deletions

View File

@@ -247,3 +247,6 @@ endif
# Workaround for prebuilt Qualcomm neural network HAL
PRODUCT_PACKAGES += \
libprotobuf-cpp-full-3.9.1-vendorcompat
PRODUCT_PACKAGES += \
NfcOverlayRedfin

View File

@@ -0,0 +1,9 @@
package {
default_applicable_licenses: ["device_google_redfin_license"],
}
runtime_resource_overlay {
name: "NfcOverlayRedfin",
sdk_version: "current",
product_specific: true
}

View File

@@ -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>

View File

@@ -0,0 +1,2 @@
# Bug component: 48448
include platform/packages/apps/Nfc:/OWNERS

View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2020 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="polling_disable_allowed">true</bool>
<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>GD1YQ</item>
<item>GTT9Q</item>
<item>G5NZ6</item>
</string-array>
<bool name="tag_intent_app_pref_supported">true</bool>
<!-- NFC Antenna Location API -->
<integer name="device_width">70</integer>
<integer name="device_height">140</integer>
<bool name="device_foldable">false</bool>
<integer-array name="antenna_x">
<item>39</item>
</integer-array>
<integer-array name="antenna_y">
<item>74</item>
</integer-array>
</resources>