Merge changes from topic "cherrypicker-L23200030000689269:N91700030011100373" into main am: d2720aa47f
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2863349 Change-Id: Ifb4f0d752ecf44994a596f9ace793eccd08672d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
Automerger Merge Worker
commit
5a9a08e93c
10 changed files with 150 additions and 2 deletions
|
|
@ -135,7 +135,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 \
|
||||||
|
NfcOverlayOriole
|
||||||
|
|
||||||
# SecureElement
|
# SecureElement
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
|
|
|
||||||
|
|
@ -142,7 +142,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 \
|
||||||
|
NfcOverlayRaven
|
||||||
|
|
||||||
# SecureElement
|
# SecureElement
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
|
|
|
||||||
9
oriole/rro_overlays/NfcOverlay/Android.bp
Normal file
9
oriole/rro_overlays/NfcOverlay/Android.bp
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
package {
|
||||||
|
default_applicable_licenses: ["device_google_raviole_license"],
|
||||||
|
}
|
||||||
|
|
||||||
|
runtime_resource_overlay {
|
||||||
|
name: "NfcOverlayOriole",
|
||||||
|
sdk_version: "current",
|
||||||
|
product_specific: true
|
||||||
|
}
|
||||||
27
oriole/rro_overlays/NfcOverlay/AndroidManifest.xml
Normal file
27
oriole/rro_overlays/NfcOverlay/AndroidManifest.xml
Normal 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
oriole/rro_overlays/NfcOverlay/OWNERS
Normal file
2
oriole/rro_overlays/NfcOverlay/OWNERS
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
# Bug component: 48448
|
||||||
|
include platform/packages/apps/Nfc:/OWNERS
|
||||||
35
oriole/rro_overlays/NfcOverlay/res/values/config.xml
Normal file
35
oriole/rro_overlays/NfcOverlay/res/values/config.xml
Normal 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>
|
||||||
|
<bool name="polling_disable_allowed">true</bool>
|
||||||
|
<string-array name="config_skuSupportsSecureNfc" translatable="false">
|
||||||
|
<item>G9S9B</item>
|
||||||
|
<item>GB7N6</item>
|
||||||
|
<item>GR1YH</item>
|
||||||
|
</string-array>
|
||||||
|
<bool name="tag_intent_app_pref_supported">true</bool>
|
||||||
|
<!-- NFC Antenna Location API -->
|
||||||
|
<integer name="device_width">72</integer>
|
||||||
|
<integer name="device_height">157</integer>
|
||||||
|
<bool name="device_foldable">false</bool>
|
||||||
|
<integer-array name="antenna_x">
|
||||||
|
<item>36</item>
|
||||||
|
</integer-array>
|
||||||
|
<integer-array name="antenna_y">
|
||||||
|
<item>106</item>
|
||||||
|
</integer-array>
|
||||||
|
</resources>
|
||||||
9
raven/rro_overlays/NfcOverlay/Android.bp
Normal file
9
raven/rro_overlays/NfcOverlay/Android.bp
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
package {
|
||||||
|
default_applicable_licenses: ["device_google_raviole_license"],
|
||||||
|
}
|
||||||
|
|
||||||
|
runtime_resource_overlay {
|
||||||
|
name: "NfcOverlayRaven",
|
||||||
|
sdk_version: "current",
|
||||||
|
product_specific: true
|
||||||
|
}
|
||||||
27
raven/rro_overlays/NfcOverlay/AndroidManifest.xml
Normal file
27
raven/rro_overlays/NfcOverlay/AndroidManifest.xml
Normal 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
raven/rro_overlays/NfcOverlay/OWNERS
Normal file
2
raven/rro_overlays/NfcOverlay/OWNERS
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
# Bug component: 48448
|
||||||
|
include platform/packages/apps/Nfc:/OWNERS
|
||||||
35
raven/rro_overlays/NfcOverlay/res/values/config.xml
Normal file
35
raven/rro_overlays/NfcOverlay/res/values/config.xml
Normal 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">true</bool>
|
||||||
|
<bool name="polling_disable_allowed">true</bool>
|
||||||
|
<string-array name="config_skuSupportsSecureNfc" translatable="false">
|
||||||
|
<item>G8V0U</item>
|
||||||
|
<item>GF5KQ</item>
|
||||||
|
<item>GLU0G</item>
|
||||||
|
</string-array>
|
||||||
|
<bool name="tag_intent_app_pref_supported">true</bool>
|
||||||
|
<!-- NFC Antenna Location API -->
|
||||||
|
<integer name="device_width">72</integer>
|
||||||
|
<integer name="device_height">167</integer>
|
||||||
|
<bool name="device_foldable">false</bool>
|
||||||
|
<integer-array name="antenna_x">
|
||||||
|
<item>36</item>
|
||||||
|
</integer-array>
|
||||||
|
<integer-array name="antenna_y">
|
||||||
|
<item>106</item>
|
||||||
|
</integer-array>
|
||||||
|
</resources>
|
||||||
Loading…
Add table
Add a link
Reference in a new issue