sm7250-common: Move to AOSP NXP NFC HAL

* NXP added snxxx support in AOSP, \o/

Change-Id: Id1b9cdbe1f29d1ff61af8182ae2f8370e5210426
This commit is contained in:
Sebastiano Barezzi 2021-10-14 19:15:50 +02:00 committed by xSylla
parent ddfe70d9ae
commit cedd2fecf6
6 changed files with 56 additions and 11 deletions

View File

@ -72,10 +72,18 @@
</interface>
</hal>
<hal format="hidl" optional="true">
<name>vendor.nxp.hardware.nfc</name>
<name>vendor.nxp.nxpese</name>
<version>1.0</version>
<interface>
<name>INxpEse</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>vendor.nxp.nxpnfc</name>
<version>2.0</version>
<interface>
<name>INqNfc</name>
<name>INxpNfc</name>
<instance>default</instance>
</interface>
</hal>

10
lito.mk
View File

@ -312,17 +312,13 @@ PRODUCT_PACKAGES += \
# NFC
PRODUCT_PACKAGES += \
android.hardware.secure_element@1.2.vendor \
android.hardware.nfc_snxxx@1.2-service \
android.hardware.secure_element_snxxx@1.2-service \
com.android.nfc_extras \
com.gsma.services.nfc \
libchrome.vendor \
NfcNci \
SecureElement \
Tag \
vendor.nxp.hardware.nfc@1.1 \
vendor.nxp.hardware.nfc@2.0 \
vendor.nxp.hardware.nfc@1.1.vendor \
vendor.nxp.hardware.nfc@2.0.vendor
Tag
# OMX
PRODUCT_PACKAGES += \

View File

@ -67,6 +67,11 @@
<transport>hwbinder</transport>
<fqname>@1.2::INfc/default</fqname>
</hal>
<hal format="hidl">
<name>vendor.nxp.nxpnfc</name>
<transport>hwbinder</transport>
<fqname>@2.0::INxpNfc/default</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.radio</name>
<transport>hwbinder</transport>
@ -117,9 +122,9 @@
<fqname>@2.0::IPictureAdjustment/default</fqname>
</hal>
<hal format="hidl">
<name>vendor.nxp.hardware.nfc</name>
<name>vendor.nxp.nxpese</name>
<transport>hwbinder</transport>
<fqname>@2.0::INqNfc/default</fqname>
<fqname>@1.0::INxpEse/default</fqname>
</hal>
<hal format="hidl">
<name>vendor.qti.data.factory</name>

View File

@ -124,6 +124,9 @@ on early-boot
write /sys/bus/msm_subsys/devices/subsys6/restart_level RELATED
on boot
enable qti_esepowermanager_service_1_1
enable vendor.nfc_hal_service
enable vendor.secure_element_hal_service
chown bluetooth bluetooth /sys/module/bluetooth_power/parameters/power
chown bluetooth net_bt /sys/class/rfkill/rfkill0/type
chown bluetooth net_bt /sys/class/rfkill/rfkill0/state
@ -412,6 +415,27 @@ service nqnfcinfo /system/vendor/bin/nqnfcinfo
user system
oneshot
service qti_esepowermanager_service_1_1 /vendor/bin/hw/vendor.qti.esepowermanager@1.1-service
override
class hal
user system
group nfc system
disabled
service vendor.nfc_hal_service /vendor/bin/hw/android.hardware.nfc_snxxx@1.2-service
override
class hal
user nfc
group nfc
disabled
service vendor.secure_element_hal_service /vendor/bin/hw/android.hardware.secure_element_snxxx@1.2-service
override
class hal
user secure_element
group secure_element
disabled
service iop /system/vendor/bin/iop
class main
user root

View File

@ -61,12 +61,18 @@
# Mlipay
/vendor/bin/mlipayd@1\.1 u:object_r:hal_mlipay_default_exec:s0
# NFC
/vendor/bin/hw/android\.hardware\.nfc_snxxx@1\.2-service u:object_r:hal_nfc_default_exec:s0
# Persist subsystem
/mnt/vendor/persist/subsys(/.*)? u:object_r:persist_subsys_file:s0
# Power
/vendor/bin/hw/android\.hardware\.power-service\.xiaomi-libperfmgr u:object_r:hal_power_default_exec:s0
# Secure element
/vendor/bin/hw/android\.hardware\.secure_element_snxxx@1\.2-service u:object_r:hal_secure_element_default_exec:s0
# Sensors
/dev/akm09970 u:object_r:hall_device:s0
/sys/bus/iio/devices u:object_r:vendor_sysfs_iio:s0

View File

@ -14,5 +14,11 @@ vendor.xiaomi.hardware.fingerprintextension::IXiaomiFingerprint
# Mlipay
vendor.xiaomi.hardware.mlipay::IMlipayService u:object_r:hal_mlipay_hwservice:s0
# NFC
vendor.nxp.nxpnfc::INxpNfc u:object_r:hal_nfc_hwservice:s0
# Secure element
vendor.nxp.nxpese::INxpEse u:object_r:hal_secure_element_hwservice:s0
# VPP
::vppService u:object_r:hal_vpp_hwservice:s0