Merge "Merge kineto chk and add NAM DHD config into modelid_cfg" into gingerbread

prebuilt/common/bin/chkkineto.sh

@@ -1,40 +0,0 @@
-#!/sbin/sh
-#
-# Remove KINETO if TMUS or GOOGLE Radio firmware not preset.
-#
-
-c=`/system/bin/getprop ro.carrier`
-p=/system/app/MS-HTCVISION-KNT20-02.apk
-r=y
-
-if [ "$c" = "TMUS" ];
-    then
-       r=n
-fi
-
-if [ "$c" = "GOOGLE" ];
-    then
-       r=n
-fi
-
-if [ "$c" = "ALL" ];
-    then
-       r=n
-fi
-
-if [ "$r" = "y" ];
-    then
-       if [ -f $p ];
-          then
-             rm -f /system/app/MS-HTCVISION-KNT20-02.apk
-             rm -f /system/lib/libkineto.so
-             rm -f /system/lib/libganril.so
-             rm -f /system/lib/librilswitch.so
-             sed 's/librilswitch.so/libhtc_ril.so/' /system/build.prop > /tmp/build.tmp
-             sed '/rilswitch/d' /tmp/build.tmp > /system/build.prop
-             chmod 644 /system/build.prop
-             rm /tmp/build*
-       fi
-fi
-
-exit 0

prebuilt/common/bin/modelid_cfg.sh

@@ -0,0 +1,70 @@
+#!/sbin/sh
+#
+
+# Remove KINETO on incorrect models.
+#
+# Valid:
+# VISION   TMUS MODELID PC1010000
+# MAHIMAHI TMUS MODELID PB9910000
+# GLACIER  TMUS MODELID PD1510000
+# Espresso TMUS MODELID PB6510000
+#
+
+kineto=/system/app/MS-HTCVISION-KNT20-02.apk
+rm_kineto=y
+
+cat /proc/cmdline|grep -q androidboot.mid=PC1010000
+if [ $? = 0 ];
+    then
+       rm_kineto=n
+fi
+
+cat /proc/cmdline|grep -q androidboot.mid=PB9910000
+if [ $? = 0 ];
+    then
+       rm_kineto=n
+fi
+
+cat /proc/cmdline|grep -q androidboot.mid=PD1510000
+if [ $? = 0 ];
+    then
+       rm_kineto=n
+fi
+
+cat /proc/cmdline|grep -q androidboot.mid=PB6510000
+if [ $? = 0 ];
+    then
+       rm_kineto=n
+fi
+
+if [ "$rm_kineto" = "y" ];
+    then
+       if [ -f $kineto ];
+          then
+             rm -f /system/app/MS-HTCVISION-KNT20-02.apk
+             rm -f /system/lib/libkineto.so
+             rm -f /system/lib/libganril.so
+             rm -f /system/lib/librilswitch.so
+             sed 's/librilswitch.so/libhtc_ril.so/' /system/build.prop > /tmp/build.tmp
+             sed '/rilswitch/d' /tmp/build.tmp > /system/build.prop
+             chmod 644 /system/build.prop
+             rm /tmp/build*
+       fi
+fi
+
+#
+# Check for spade; if NAM model update DSP and GPS config
+#
+
+cat /proc/cmdline | grep -q spade
+if [ $? = 0 ];
+   then 
+cat /proc/cmdline | grep -q androidboot.mid=PD9812000
+      if [ $? = 0 ];
+         then
+            mv /system/etc/nam/*MCLK.txt /system/etc/soundimage/
+            mv /system/etc/nam/CodecDSPID.txt /system/etc
+            mv /system/etc/nam/gps.conf /system/etc
+      fi
+    rm -R /system/etc/nam
+fi

products/common.mk

@@ -58,7 +58,7 @@ include vendor/cyanogen/products/themes_common.mk
 
 PRODUCT_COPY_FILES += \
     vendor/cyanogen/prebuilt/common/bin/backuptool.sh:system/bin/backuptool.sh \
-    vendor/cyanogen/prebuilt/common/bin/chkkineto.sh:system/bin/chkkineto.sh \
+    vendor/cyanogen/prebuilt/common/bin/modelid_cfg.sh:system/bin/modelid_cfg.sh \
     vendor/cyanogen/prebuilt/common/bin/verify_cache_partition_size.sh:system/bin/verify_cache_partition_size.sh \
     vendor/cyanogen/prebuilt/common/etc/resolv.conf:system/etc/resolv.conf \
     vendor/cyanogen/prebuilt/common/etc/sysctl.conf:system/etc/sysctl.conf \