diff --git a/common.mk b/common.mk
index 8355d0f..6935409 100644
--- a/common.mk
+++ b/common.mk
@@ -228,6 +228,7 @@ PRODUCT_PACKAGES += \
# NFC
PRODUCT_PACKAGES += \
+ android.hardware.nfc@1.2-service.samsung \
libnfc-nci \
libnfc_nci_jni \
NfcNci \
@@ -240,7 +241,6 @@ PRODUCT_COPY_FILES += \
$(COMMON_PATH)/configs/nfc/libnfc-qrd-SN100_38_4MHZ.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-qrd-SN100_38_4MHZ.conf \
$(COMMON_PATH)/configs/nfc/libnfc-sec-vendor.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-sec-vendor.conf \
$(COMMON_PATH)/configs/nfc/nfcee_access.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/nfcee_access.xml \
- $(COMMON_PATH)/configs/nfc/nfc_key:$(TARGET_COPY_OUT_SYSTEM)/etc/nfc_key \
$(COMMON_PATH)/configs/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/libnfc-nci.conf
# OMX
diff --git a/configs/framework_compatibility_matrix.xml b/configs/framework_compatibility_matrix.xml
index 4deb3e4..30e95a1 100644
--- a/configs/framework_compatibility_matrix.xml
+++ b/configs/framework_compatibility_matrix.xml
@@ -278,23 +278,6 @@
default
-
- vendor.nxp.hardware.nfc
- 1.0-1
- 2.0
-
- INqNfc
- default
-
-
-
- vendor.nxp.nxpnfclegacy
- 1.0
-
- INxpNfcLegacy
- default
-
-
vendor.qti.automotive.qcarcam
1.0
@@ -968,22 +951,6 @@
default
-
- vendor.samsung.hardware.nfc
- 2.0
-
- ISehNfc
- default
-
-
-
- vendor.samsung.hardware.nfc
- 2.0
-
- ISehNfc
- default
-
-
vendor.samsung.hardware.radio
2.1
diff --git a/lineage.dependencies b/lineage.dependencies
index 807459f..13a813a 100644
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -2,5 +2,9 @@
{
"repository": "android_kernel_samsung_sm7125",
"target_path": "kernel/samsung/sm7125"
- }
+ },
+ {
+ "repository": "android_hardware_samsung_nfc",
+ "target_path": "hardware/samsung/nfc"
+ }
]
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 97bcab5..513318c 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -943,17 +943,9 @@ vendor/lib/libhta.so
vendor/lib64/libhta.so
# NFC
-vendor/bin/nqnfcinfo
-vendor/bin/hw/sec.android.hardware.nfc@1.2-service
-vendor/etc/init/sec.android.hardware.nfc@1.2-service.rc
--vendor/etc/vintf/manifest/sec.android.hardware.nfc@1.2-service.xml
vendor/etc/nfc/sec_s3nrn4v_hwreg.bin
vendor/etc/nfc/sec_s3nrn4v_swreg.bin
vendor/firmware/nfc/sec_s3nrn4v_firmware.bin
-vendor/lib64/vendor.samsung.hardware.nfc@2.0.so
-vendor/lib64/nfc_nci_sec.so
-vendor/lib64/libNfcProperties.so
-vendor/lib/libsn100u_fw.so
# OMX
vendor/etc/seccomp_policy/mediacodec.policy
diff --git a/rootdir/etc/init.nfc.samsung.rc b/rootdir/etc/init.nfc.samsung.rc
index 7ea9444..30453a3 100644
--- a/rootdir/etc/init.nfc.samsung.rc
+++ b/rootdir/etc/init.nfc.samsung.rc
@@ -21,6 +21,6 @@ on post-fs-data
# NFC KEY
mkdir /data/nfc_log 0750 nfc system
- copy /system/etc/nfc_key /data/nfc/Key
+# copy /system/etc/nfc_key /data/nfc/Key
chmod 660 /data/nfc/Key
chown nfc nfc /data/nfc/Key
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 679a470..32cbc10 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -472,11 +472,11 @@ on post-fs-data
mkdir /efs/biometrics 0770 system system
mkdir /efs/biometrics/meta 0770 system system
-service nqnfcinfo /system/vendor/bin/nqnfcinfo
- class late_start
- group nfc
- user system
- oneshot
+#service nqnfcinfo /system/vendor/bin/nqnfcinfo
+# class late_start
+# group nfc
+# user system
+# oneshot
service iop /system/vendor/bin/iop
class main
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 8e95042..8d0a994 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -21,4 +21,4 @@
/(vendor|system/vendor)/bin/hw/vendor.samsung.hardware.biometrics.fingerprint@3.0-service u:object_r:hal_fingerprint_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.samsung.sm7125 u:object_r:hal_lineage_fod_default_exec:s0
/(vendor|system/vendor)/bin/hw/android.hardware.vibrator@1.3-service.sm7125 u:object_r:hal_vibrator_default_exec:s0
-/(vendor|system/vendor)/bin/hw/sec.android.hardware.nfc@1.2-service u:object_r:hal_nfc_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.nfc@1\.2-service\.samsung u:object_r:hal_nfc_default_exec:s0