Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"

041ffd8ea6

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:13426a9d37641687908d97c969a2c547eb5f19cd)
Merged-In: I443bcf2681437ec4a0caa3fdb5046ab856db0ddb
Change-Id: I443bcf2681437ec4a0caa3fdb5046ab856db0ddb

Change-Id: Ic52d8977c950aec66a6206736fa0ded4adacb1c2
This commit is contained in:
Roshan Pius 2023-12-01 19:19:56 +00:00
parent 34aaf50436
commit 8f013ac1a6
5 changed files with 75 additions and 1 deletions

View file

@ -0,0 +1,9 @@
package {
default_applicable_licenses: ["device_google_bluejay_license"],
}
runtime_resource_overlay {
name: "NfcOverlayBluejay",
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,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">false</bool>
<string-array name="config_skuSupportsSecureNfc" translatable="false">
<item>GB62Z</item>
<item>G1AZG</item>
<item>GX7AS</item>
<item>GB17L</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>83</item>
</integer-array>
</resources>

View file

@ -102,7 +102,8 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ NfcNci \
Tag \ Tag \
android.hardware.nfc-service.st android.hardware.nfc-service.st \
NfcOverlayBluejay
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \