berlna: switch to AIDL NFC ST HAL

Equivalence between ro.vendor.hw.nfc and config names found by
reverse engineering CNfcConfig::GetInstance().

Change-Id: I9fbe7116420920d99c2ffbb8502178f70225b62c

device.mk

@@ -64,7 +64,7 @@ PRODUCT_PACKAGES += \
 
 # NFC
 PRODUCT_PACKAGES += \
-    android.hardware.nfc@1.2-service.st \
+    android.hardware.nfc-service.st \
     com.android.nfc_extras \
     Tag
 

extract-files.py

@@ -39,7 +39,7 @@ lib_fixups: lib_fixups_user_type = {
 blob_fixups: blob_fixups_user_type = {
     ('vendor/lib/libmot_chi_desktop_helper.so', 'vendor/lib64/libmot_chi_desktop_helper.so'): blob_fixup()
         .add_needed('libgui_shim_vendor.so'),
-    ('vendor/bin/STFlashTool', 'vendor/lib64/sensors.moto.so'): blob_fixup()
+    'vendor/lib64/sensors.moto.so': blob_fixup()
         .add_needed('libbase_shim.so'),
 }  # fmt: skip
 

init/init.vendor.st21nfc.rc

@@ -2,22 +2,21 @@
 # This file needs to be executed by vendor_init at boot of the device,
 # both in normal and factory mode.
 
-on post-fs
+on early-boot
 	# Change ownership and permision of st nfc device
 	chown nfc nfc /dev/st21nfc
 	chmod 0660 /dev/st21nfc
 
-on property:ro.vendor.hw.nfc=true && property:persist.vendor.radio.multisim.config=*
-	start vendor.stflashtool
+on property:ro.vendor.hw.nfc=true
+	start vendor.st_nfc_hal_service
 
-on property:ro.vendor.hw.nfc=st && property:persist.vendor.radio.multisim.config=*
-	start vendor.stflashtool
+on property:ro.vendor.hw.nfc=st
+	setprop persist.vendor.nfc.config_file_name libnfc-hal-st.conf
+	start vendor.st_nfc_hal_service
 
-on property:ro.vendor.hw.nfc=ese_st && property:persist.vendor.radio.multisim.config=*
-	start vendor.stflashtool
-
-service vendor.stflashtool /vendor/bin/STFlashTool -c /vendor/etc/st21nfc_conf.txt -P vendor.nfc.fw_status
-	group nfc
+service vendor.st_nfc_hal_service /vendor/bin/hw/android.hardware.nfc-service.st
+	override
+	class hal
 	user nfc
-	oneshot
+	group nfc
 	disabled

proprietary-files.txt

@@ -297,9 +297,6 @@ product/etc/permissions/com.motorola.moto-uirefresh.xml
 product/etc/permissions/com.motorola.motodisplay.xml
 product/etc/permissions/privapp-permissions-com.motorola.motodisplay.xml
 
-# NFC
-vendor/bin/STFlashTool
-
 # NFC - configs
 vendor/etc/libnfc-hal-st.conf
 vendor/etc/libnfc-nci-st.conf

system_ext.prop

@@ -1,5 +1,8 @@
 # Display
 sys.brightness.disable_gamma_conversion=true
 
+# NFC
+persist.nfc_cfg.config_file_name=libnfc-nci-st.conf
+
 # Telephony
 ril.subscription.types=RUIM

vendor.prop

@@ -12,5 +12,8 @@ vendor.mm.en.sec.smoothstreaming=false
 # Camera
 persist.vendor.camera.physical.num=4
 
+# NFC
+persist.vendor.nfc.st.multisim_fw_config=true
+
 # Radio
 ro.telephony.default_network=27,27