FP3: NXP PN553 NFC support

Add NFC and Secure Element HIDL Implementation
'

BoardConfig.mk

@@ -193,8 +193,8 @@ TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/recovery.fstab
 # Vendor Security Patch Level
 VENDOR_SECURITY_PATCH := "2018-08-05"
 
-# Encryption
-TARGET_HW_DISK_ENCRYPTION := false
+# NFC
+TARGET_USES_NQ_NFC := true
 
 # SELinux
 include device/qcom/sepolicy/sepolicy.mk

device.mk

@@ -192,6 +192,7 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml \
     frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml \
     frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \
+    frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.android.nfc_extras.xml \
     frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
 
 # QCOM
@@ -474,6 +475,26 @@ PRODUCT_PACKAGES += \
 PRODUCT_BOOT_JARS += \
     telephony-ext
 
+# Secure Element
+PRODUCT_PACKAGES += \
+    SecureElement \
+    android.hardware.secure_element@1.0
+
+# NFC
+PRODUCT_PACKAGES += \
+    NfcNci \
+    Tag \
+    libnqnfc-nci \
+    libnqnfc_nci_jni \
+    libp61-jcop-kit \
+    com.nxp.nfc.nq \
+    com.android.nfc_extras \
+    vendor.nxp.hardware.nfc@1.0 \
+    vendor.nxp.hardware.nfc@1.1-service
+
+PRODUCT_BOOT_JARS += com.nxp.nfc.nq
+
+# Wifi
 PRODUCT_PACKAGES += \
     android.hardware.wifi@1.0-service \
     dhcpcd.conf \

manifest.xml

@@ -185,7 +185,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-<!--     <hal format="hidl">
+    <hal format="hidl">
         <name>android.hardware.nfc</name>
         <transport>hwbinder</transport>
         <version>1.1</version>
@@ -193,7 +193,16 @@
             <name>INfc</name>
             <instance>default</instance>
         </interface>
-    </hal> -->
+    </hal>
+    <hal format="hidl">
+        <name>vendor.nxp.hardware.nfc</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>INqNfc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.power</name>
         <transport>hwbinder</transport>
@@ -218,6 +227,16 @@
             <instance>slot2</instance>
         </interface>
     </hal>
+   <hal format="hidl">
+       <name>android.hardware.secure_element</name>
+       <transport>hwbinder</transport>
+       <version>1.0</version>
+       <interface>
+           <name>ISecureElement</name>
+           <instance>SIM1</instance>
+           <instance>SIM2</instance>
+       </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.radio.config</name>
         <transport>hwbinder</transport>

proprietary-files.txt

@@ -1128,3 +1128,11 @@ vendor/firmware/fingerprint.b03
 vendor/firmware/fingerprint.b04
 vendor/firmware/fingerprint.b05
 vendor/firmware/fingerprint.b06
+
+# NFC - PN553
+vendor/bin/nqnfcinfo
+vendor/lib/libpn553_fw.so
+vendor/etc/libnfc-mtp-NQ3XX.conf
+vendor/etc/libnfc-qrd-NQ3XX.conf
+vendor/etc/libnfc-nci_NCI2_0.conf
+vendor/etc/libnfc-nci.conf

vendor_prop.mk

@@ -286,3 +286,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Enable TDES support when KM4 is enabled
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.hardware.keystore_desede=true
+
+# NFC
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.hardware.nfc_nci=nqx.default