a7xelte: dont attempt to download nfc firmware when nfc is off

* property got renamed in lineage-16.0

Change-Id: Iddc9005121a9d90de1635a96d40e28be3fbe1171

diff --git a/device.mk b/device.mk
index e0be8215deb7273379c318504e971ec5eb25eaf2..8f582026f21f52b5ee1cf7873d6c67888b12ba9f 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -91,9 +91,6 @@ PRODUCT_PACKAGES += \
     com.android.nfc_extras \
     android.hardware.nfc@1.0-impl
 
     com.android.nfc_extras \
     android.hardware.nfc@1.0-impl
 

-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.nfc.sec_hal=true
-

 # Permissions
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
 # Permissions
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \

diff --git a/system_prop.mk b/system_prop.mk
index c6906c6efd31d8fe60c0948233ffa70ba1a76d6f..3c2acefba8b3cf33b50261348f9d0e8997f24d2c 100644 (file)
--- a/system_prop.mk
+++ b/system_prop.mk
@@ -27,6 +27,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
     dalvik.vm.heapminfree=2m \
     dalvik.vm.heapmaxfree=8m
 
     dalvik.vm.heapminfree=2m \
     dalvik.vm.heapmaxfree=8m
 

+# NFC
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.nfc.fw_dl_on_boot=false
+

 # Radio
 PRODUCT_PROPERTY_OVERRIDES += \
     telephony.lteOnCdmaDevice=0 \
 # Radio
 PRODUCT_PROPERTY_OVERRIDES += \
     telephony.lteOnCdmaDevice=0 \