Switch NFC from HIDL to AIDL

Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Merged-In: I33d07604e87a2d9466a3a857e281ee4b611330a8 Change-Id: I33d07604e87a2d9466a3a857e281ee4b611330a8
Evolution-XYZ-Devices · May 17, 2022 · 5f6dbc5 · 5f6dbc5
1 parent 017ab6f
commit 5f6dbc5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/device.mk b/device.mk
@@ -445,7 +445,7 @@ PRODUCT_PACKAGES += \
     NfcNci \
     Tag \
     SecureElement \
-    android.hardware.nfc@1.2-service.st \
+    android.hardware.nfc-service.st \
     [email protected]
 
 PRODUCT_COPY_FILES += \

diff --git a/manifest.xml b/manifest.xml
@@ -442,15 +442,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <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>
     <!-- Neural Network HAL -->
     <hal format="hidl">
         <name>android.hardware.neuralnetworks</name>

diff --git 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