From 4fff7dcbbe969ffc663184004f88e415215d65be Mon Sep 17 00:00:00 2001
From: BigMajster <maszlij11@gmail.com>
Date: Thu, 15 Jan 2015 18:24:33 +0100
Subject: [PATCH] More updates for D415

Change-Id: Ib6d5e4c2dc75b92ed525f905b235e1e5abb9d084
---
 device_w7.mk                     |  1 -
 init/init_w7.c                   | 23 +++++++----------------
 prebuilt/etc/init.zetaw.model.sh | 10 ++++++++--
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/device_w7.mk b/device_w7.mk
index f1cd136..1e76be6 100644
--- a/device_w7.mk
+++ b/device_w7.mk
@@ -224,7 +224,6 @@ PRODUCT_PACKAGES += \
     copybit.msm8226\
     gralloc.msm8226 \
     hwcomposer.msm8226 \
-    keystore.msm8226 \
     lights.msm8226 \
     memtrack.msm8226 \
     power.msm8226
diff --git a/init/init_w7.c b/init/init_w7.c
index 9549b7f..260eec9 100644
--- a/init/init_w7.c
+++ b/init/init_w7.c
@@ -79,7 +79,7 @@ void init_msm_properties(unsigned long msm_id, unsigned long msm_ver, char *boar
 
     property_get("ro.boot.serialno", serial);
     if (strncmp(serial, "LGD410", 6) == 0) {
-        /* D415, D410n (is this exist!?) */
+        /* D410, D410hn */
         if (check_cmdline("model.name=LG-D410hn") == 1) {
                 property_set("ro.product.device", "w7nds");
                 property_set("ro.product.model", "LG-D410hn");
@@ -91,7 +91,6 @@ void init_msm_properties(unsigned long msm_id, unsigned long msm_ver, char *boar
         property_set("ro.build.description", "w7ds_global_com-user 4.4.2 KOT49I.A1398228431 1398228431 release-keys");
         property_set("ro.build.fingerprint", "lge/w7ds_global_com/w7ds:4.4.2/KOT49I.A1398228431/1398228431:user/release-keys");
         property_set("persist.radio.multisim.config", "dsds");
-        property_set("telephony.lteOnCdmaDevice", "0");
     } else if (strncmp(serial, "LGD405", 6) == 0) {
         /* D405, D405n */
         if (check_cmdline("model.name=LG-D405n") == 1) {
@@ -104,29 +103,21 @@ void init_msm_properties(unsigned long msm_id, unsigned long msm_ver, char *boar
         }
         property_set("ro.build.description", "w7_global_com-user 4.4.2 KOT49I.A1402966338 1402966338 release-keys");
         property_set("ro.build.fingerprint", "lge/w7_global_com/w7:4.4.2/KOT49I.A1402966338/1402966338:user/release-keys");
+        property_set("ro.telephony.ril_class", "LgeW7RIL");
         property_set("persist.radio.multisim.config", "");
-        property_set("telephony.lteOnCdmaDevice", "0");
     } else if (strncmp(serial, "LGD415", 6) == 0) {
-        /* D415, D415n (is this exist!?) */
-        if (check_cmdline("model.name=LG-D415n") == 1) {
-                property_set("ro.product.device", "w7nds");
-                property_set("ro.product.model", "LG-D415n");
-                property_set("persist.radio.multisim.config", "dsds");
-        } else {
-                property_set("ro.product.device", "w7");
-                property_set("ro.product.model", "LG-D415");
-                property_set("persist.radio.multisim.config", "");
-        }
-        property_set("ro.nfc.port", "I2C");
+        /* D415 */
+        property_set("ro.product.model", "LG-D415");
+        property_set("ro.product.device", "w7");
         property_set("ro.build.description", "w7_tmo_us-user 4.4.2 KOT49I.D41510c D41510c.1393916607 release-keys");
         property_set("ro.build.fingerprint", "lge/w7_tmo_us/w7:4.4.2/KOT49I.D41510c/D41510c.1393916607:user/release-keys");
-        property_set("telephony.lteOnCdmaDevice", "0");
+        property_set("ro.telephony.ril_class", "LgeW7RIL");
+        property_set("persist.radio.multisim.config", "");
     } else {
         /* XXX */
         property_set("ro.product.device", "w7");
         property_set("ro.product.model", "Please write your model name to agent00791@gmail.com");
         property_set("persist.radio.multisim.config", "");
-        property_set("telephony.lteOnCdmaDevice", "0");
     }
     property_get("ro.product.device", device);
     strlcpy(devicename, device, sizeof(devicename));
diff --git a/prebuilt/etc/init.zetaw.model.sh b/prebuilt/etc/init.zetaw.model.sh
index 2d5d859..ed54ee1 100644
--- a/prebuilt/etc/init.zetaw.model.sh
+++ b/prebuilt/etc/init.zetaw.model.sh
@@ -11,11 +11,17 @@ else
 	ln -s /system/usr/keylayout/Generic-D4x5.kl /system/usr/keylayout/Generic.kl
 fi
 
-if [ "$model" = "LG-D410" ] || [ "$model" = "LG-D405" ]; then
+if [ "$model" = "LG-D410" ] || [ "$model" = "LG-D405" ] || [ "$model" = "LG-D415" ]; then
 	chmod 000 /system/etc/permissions/android.hardware.nfc.xml
 	chmod 000 /system/etc/permissions/android.hardware.nfc.hce.xml
 	chmod 000 /system/lib/hw/nfc_nci.w7.so
-	chmod 000 /system/app/NfcNci/NfcNci.apk
+	find /system/app/NfcNci -type f -exec chmod 000 {} \;
+fi
+
+if [ "$model" = "LG-D415" ]; then
+	chmod 000 /system/bin/fm_qsoc_patches
+	chmod 000 /system/etc/permissions/qcom.fmradio.xml
+	find /system/app/FM2 -type f -exec chmod 000 {} \;
 fi
 
 mount -o remount,ro /system