From 1f8682bf6941dc111ff69d59d87210d8487074e8 Mon Sep 17 00:00:00 2001
From: George Chang <georgekgchang@google.com>
Date: Thu, 5 May 2022 01:41:30 +0800
Subject: [PATCH] Switch NFC from HIDL to AIDL

Bug: 216290344
Test: atest NfcNciInstrumentationTests
Test: atest VtsAidlHalNfcTargetTest
Change-Id: Id3f65723c6240bbae6f6cc92e7ee57e07e1f0974
---
 device-lynx.mk         |  3 +--
 nfc/libnfc-hal-st.conf |  4 ++--
 nfc/manifest_nfc.xml   | 11 -----------
 3 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 nfc/manifest_nfc.xml

diff --git a/device-lynx.mk b/device-lynx.mk
index 5e99c00..57c264a 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -59,7 +59,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc@1.2-service.st
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -73,7 +73,6 @@ PRODUCT_COPY_FILES += \
 	device/google/lynx/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
 
 DEVICE_MANIFEST_FILE += \
-	device/google/lynx/nfc/manifest_nfc.xml \
 	device/google/lynx/nfc/manifest_se.xml
 
 # Thermal Config
diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf
index 60e84ac..1a134f4 100644
--- a/nfc/libnfc-hal-st.conf
+++ b/nfc/libnfc-hal-st.conf
@@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
 NCI_HAL_MODULE="nfc_nci.st21nfc"
 
 ###############################################################################
-# White list to be set at startup.
-DEVICE_HOST_WHITE_LIST={02:C0}
+# ALLOW list to be set at startup.
+DEVICE_HOST_ALLOW_LIST={02:C0}
 
 ###############################################################################
 # BAIL OUT value for P2P
diff --git a/nfc/manifest_nfc.xml b/nfc/manifest_nfc.xml
deleted file mode 100644
index 86caacb..0000000
--- a/nfc/manifest_nfc.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-       <name>android.hardware.nfc</name>
-       <transport>hwbinder</transport>
-       <version>1.2</version>
-       <interface>
-           <name>INfc</name>
-           <instance>default</instance>
-       </interface>
-    </hal>
-</manifest>