Switch NFC from HIDL to AIDL
Bug: 216290344
Test: atest NfcNciInstrumentationTests
Test: atest VtsAidlHalNfcTargetTest
Change-Id: Ide115013131a79989d36e0a738a2918166192731
diff --git a/device-felix.mk b/device-felix.mk
index d258106..bc38671 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -85,7 +85,7 @@
PRODUCT_PACKAGES += \
NfcNci \
Tag \
- [email protected]
+ android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@@ -99,7 +99,6 @@
device/google/felix/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \
- device/google/felix/nfc/manifest_nfc.xml \
device/google/felix/nfc/manifest_se.xml
# Power HAL config
diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf
index 0035a70..b7599c7 100644
--- a/nfc/libnfc-hal-st.conf
+++ b/nfc/libnfc-hal-st.conf
@@ -60,8 +60,8 @@
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 bf6b7cc..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>
