diff --git a/framework_compatibility_matrix.xml b/framework_compatibility_matrix.xml
index 9f4e9ea..5e628aa 100644
--- a/framework_compatibility_matrix.xml
+++ b/framework_compatibility_matrix.xml
@@ -72,10 +72,18 @@
- vendor.nxp.hardware.nfc
+ vendor.nxp.nxpese
+ 1.0
+
+ INxpEse
+ default
+
+
+
+ vendor.nxp.nxpnfc
2.0
- INqNfc
+ INxpNfc
default
diff --git a/lito.mk b/lito.mk
index 569965b..2056248 100644
--- a/lito.mk
+++ b/lito.mk
@@ -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 += \
diff --git a/manifest.xml b/manifest.xml
index 84eb48e..7cd8b84 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -67,6 +67,11 @@
hwbinder
@1.2::INfc/default
+
+ vendor.nxp.nxpnfc
+ hwbinder
+ @2.0::INxpNfc/default
+
android.hardware.radio
hwbinder
@@ -117,9 +122,9 @@
@2.0::IPictureAdjustment/default
- vendor.nxp.hardware.nfc
+ vendor.nxp.nxpese
hwbinder
- @2.0::INqNfc/default
+ @1.0::INxpEse/default
vendor.qti.data.factory
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 6f732b1..8e4c366 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -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
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index c6ecc0f..16ee44a 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -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
diff --git a/sepolicy/vendor/hwservice_contexts b/sepolicy/vendor/hwservice_contexts
index 58a822c..95ec5ad 100644
--- a/sepolicy/vendor/hwservice_contexts
+++ b/sepolicy/vendor/hwservice_contexts
@@ -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