Merge changes from topic "cherrypicker-L23200030000689269:N91700030011100373" into main
* changes:
Revert^2 "raviole(nfc): Modify NFC overlays for NFC apex"
Revert^2 "raven: Replace NFC app with NFC apex"
diff --git a/device-oriole.mk b/device-oriole.mk
index a260d2d..9a01108 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -133,9 +133,10 @@
device/google/raviole/nfc/libnfc-nci.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 \
+ NfcOverlayOriole
# SecureElement
PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index 5ccf832..b4b400a 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -140,9 +140,10 @@
device/google/raviole/nfc/libnfc-nci-raven.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 \
+ NfcOverlayRaven
# SecureElement
PRODUCT_PACKAGES += \
diff --git a/device-slider.mk b/device-slider.mk
index 5cbab35..5864316 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -83,7 +83,7 @@
device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \
- NfcNci \
+ $(RELEASE_PACKAGE_NFC_STACK) \
Tag \
android.hardware.nfc-service.st
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 0c366c8..c6c94e8 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -79,7 +79,7 @@
device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \
- NfcNci \
+ $(RELEASE_PACKAGE_NFC_STACK) \
Tag \
android.hardware.nfc-service.st
diff --git a/oriole/rro_overlays/NfcOverlay/Android.bp b/oriole/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 0000000..80de891
--- /dev/null
+++ b/oriole/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+ default_applicable_licenses: ["device_google_raviole_license"],
+}
+
+runtime_resource_overlay {
+ name: "NfcOverlayOriole",
+ sdk_version: "current",
+ product_specific: true
+}
diff --git a/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml b/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..5241aa4
--- /dev/null
+++ b/oriole/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/oriole/rro_overlays/NfcOverlay/OWNERS b/oriole/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 0000000..35e9713
--- /dev/null
+++ b/oriole/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/oriole/rro_overlays/NfcOverlay/res/values/config.xml b/oriole/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 0000000..d1f5832
--- /dev/null
+++ b/oriole/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">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>
diff --git a/raven/rro_overlays/NfcOverlay/Android.bp b/raven/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 0000000..85b298c
--- /dev/null
+++ b/raven/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+ default_applicable_licenses: ["device_google_raviole_license"],
+}
+
+runtime_resource_overlay {
+ name: "NfcOverlayRaven",
+ sdk_version: "current",
+ product_specific: true
+}
diff --git a/raven/rro_overlays/NfcOverlay/AndroidManifest.xml b/raven/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..5241aa4
--- /dev/null
+++ b/raven/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/raven/rro_overlays/NfcOverlay/OWNERS b/raven/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 0000000..35e9713
--- /dev/null
+++ b/raven/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/raven/rro_overlays/NfcOverlay/res/values/config.xml b/raven/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 0000000..e17a0a2
--- /dev/null
+++ b/raven/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>
+ <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>