google-gs201/android_device_google_lynx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2864192

Change-Id: I16a26d176ade015d41beb9b8df20595761f54b82
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:18 +00:00
committed by Automerger Merge Worker
parent 22ea4bbc32 aadca75653
commit 8e993b8f68
5 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
device-lynx.mk
View File

@@ -80,7 +80,8 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
$(RELEASE_PACKAGE_NFC_STACK) \ $(RELEASE_PACKAGE_NFC_STACK) \
Tag \ Tag \
android.hardware.nfc-service.st android.hardware.nfc-service.st \
NfcOverlayLynx
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

9
rro_overlays/NfcOverlay/Android.bp Normal file
View File

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

27
rro_overlays/NfcOverlay/AndroidManifest.xml Normal file
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>

2
rro_overlays/NfcOverlay/OWNERS Normal file
View File

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

35
rro_overlays/NfcOverlay/res/values/config.xml Normal file
View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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">false</bool>
<string-array name="config_skuSupportsSecureNfc" translatable="false">
<item>G0DZQ</item>
<item>GWKK3</item>
<item>GHL1X</item>
<item>G82U8</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">150</integer>
<bool name="device_foldable">false</bool>
<integer-array name="antenna_x">
<item>36</item>
</integer-array>
<integer-array name="antenna_y">
<item>102</item>
</integer-array>
</resources>