From 2a4dfa5de9e6cba79ecd7a9e4cca9dd93bc5f105 Mon Sep 17 00:00:00 2001
From: George Chang <georgekgchang@google.com>
Date: Wed, 26 Jan 2022 23:53:35 +0800
Subject: [PATCH] Switch NFC from HIDL to AIDL

Bug: 216290344
Test: atest NfcNciInstrumentationTests
Test: atest VtsAidlHalNfcTargetTest
Merged-In: I33d07604e87a2d9466a3a857e281ee4b611330a8
Change-Id: I33d07604e87a2d9466a3a857e281ee4b611330a8
---
 device.mk              | 2 +-
 manifest.xml           | 9 ---------
 nfc/libnfc-hal-st.conf | 4 ++--
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/device.mk b/device.mk
index b7485a9..714c9ef 100644
--- a/device.mk
+++ b/device.mk
@@ -319,7 +319,7 @@ PRODUCT_PACKAGES += \
 
 # NFC
 PRODUCT_PACKAGES += \
-    android.hardware.nfc@1.2-service.st \
+    android.hardware.nfc-service.st \
     android.hardware.secure_element@1.2.vendor \
     com.android.nfc_extras \
     nfc_nci.st21nfc.default \
diff --git a/manifest.xml b/manifest.xml
index 373543c..8426573 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -81,15 +81,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.nfc</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>INfc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>
diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf
index 88f82f1..ebd4224 100644
--- a/nfc/libnfc-hal-st.conf
+++ b/nfc/libnfc-hal-st.conf
@@ -67,8 +67,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