several ril changes and cleanup

percy-g2 · Sep 12, 2014 · 57ba0ff · 57ba0ff
1 parent 2f58ca5
commit 57ba0ff
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 24 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -39,7 +39,7 @@ TARGET_KERNEL_CONFIG := cm_condor_defconfig
 BOARD_KERNEL_BASE := 0x00000000
 BOARD_KERNEL_PAGESIZE := 2048
 
-BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 utags.blkdev=/dev/block/platform/msm_sdcc.1/by-name/utags vmalloc=400M
+BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 utags.blkdev=/dev/block/platform/msm_sdcc.1/by-name/utags vmalloc=400M androidboot.write_protect=0
 
 BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x01000000 --tags_offset 0x00000100
 

diff --git a/cm.mk b/cm.mk
@@ -1,6 +1,3 @@
-## Specify phone tech before including full_phone
-$(call inherit-product, vendor/cm/config/gsm.mk)
-
 # Boot animation
 TARGET_SCREEN_HEIGHT := 960
 TARGET_SCREEN_WIDTH := 540
@@ -22,6 +19,7 @@ PRODUCT_DEVICE := condor
 PRODUCT_NAME := cm_condor
 PRODUCT_BRAND := motorola
 PRODUCT_MODEL := Moto E
+PRODUCT_RELEASE_NAME := MOTO E
 PRODUCT_MANUFACTURER := Motorola
 
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
diff --git a/device.mk b/device.mk
@@ -248,10 +248,11 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/prebuilt/moto_com.sh:system/bin/moto_com.sh
 
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.opengles.version=131072
+    ro.sf.lcd_density=240
 
+# Recovery
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.sf.lcd_density=240
+    ro.cwm.forbid_format=/fsg,/firmware,/persist,/boot
 
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.hwc.mdpcomp.enable=true

diff --git a/rootdir/init.mmi.rc b/rootdir/init.mmi.rc
@@ -40,13 +40,13 @@ on init
 
 on fs
     # Mount PDS
-    wait /dev/block/platform/msm_sdcc.1/by-name/pds
-    exec /system/bin/mountpds -d /dev/block/platform/msm_sdcc.1/by-name/pds -m rw
-    restorecon /pds /pds/public/atvc
+    #wait /dev/block/platform/msm_sdcc.1/by-name/pds
+    #exec /system/bin/mountpds -d /dev/block/platform/msm_sdcc.1/by-name/pds -m rw
+    #restorecon /pds /pds/public/atvc
 
     # Mount modem FSG partition
     wait /dev/block/platform/msm_sdcc.1/by-name/fsg
-    mount ext4 /dev/block/platform/msm_sdcc.1/by-name/fsg /fsg ro nosuid nodev barrier=0 defcontext=u:object_r:modem_file:s0
+    mount ext4 /dev/block/platform/msm_sdcc.1/by-name/fsg /fsg ro nosuid nodev barrier=0
 
     #Backup ramconsole on abnormal reboot.
     copy /proc/last_kmsg /data/dontpanic/last_kmsg
@@ -379,7 +379,7 @@ service mmi-boot-sh /system/bin/sh /init.mmi.boot.sh
     user root
     oneshot
 
-service mmi-touch-sh /system/bin/logwrapper /system/bin/sh /init.mmi.touch.sh synaptics
+service mmi-touch-sh /system/bin/sh /init.mmi.touch.sh synaptics
     class late_start
     user root
     oneshot
@@ -425,11 +425,6 @@ service atvc /system/bin/dbvc_atvc_property_set
    group mot_tpapi
    oneshot
 
-service qe /xbin/qe /system
-   class main
-   oneshot
-   disabled
-
 service ss_rdump /system/bin/subsystem_ramdump 1 0
    class late_start
    user radio

diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
@@ -27,7 +27,7 @@
 
 # use init.mmi.usb.rc
 #import init.qcom.usb.rc
-import init.target.rc
+#import init.target.rc
 
 on early-init
     write /sys/block/mmcblk0/queue/scheduler noop
@@ -93,6 +93,9 @@ on boot
     mkdir /dev/socket/qmux_gps 0770 gps gps
     chmod 2770 /dev/socket/qmux_gps
 
+     # Prevents permission denied error for telephony
+    chmod 0644 /proc/cmdline
+
     setprop wifi.interface wlan0
 
 #   Define TCP buffer sizes for various networks
@@ -163,6 +166,11 @@ on boot
     mkdir /data/nfc 0770 nfc nfc
     mkdir /data/nfc/param 0770 nfc nfc
 
+    setprop ro.hw.device ${ro.boot.device}
+    setprop ro.hw.hwrev ${ro.boot.hwrev}
+    setprop ro.hw.radio ${ro.boot.radio}
+
+
 # msm specific files that need to be created on /data
 on post-fs-data
     # we will remap this as /mnt/sdcard with the sdcard fuse tool
@@ -178,13 +186,6 @@ on post-fs-data
     mkdir /data/misc/dhcp 0770 dhcp dhcp
     chown dhcp dhcp /data/misc/dhcp
 
-    # Create the directories used by CnE subsystem
-    mkdir /data/connectivity 0771 system system
-    chown system system /data/connectivity
-
-    mkdir /data/connectivity/nsrm 0771 system system
-    chown system system /data/connectivity/nsrm
-
     # Create directory used by audio subsystem
     mkdir /data/misc/audio 0770 audio audio
 

diff --git a/rootdir/ueventd.qcom.rc b/rootdir/ueventd.qcom.rc
@@ -25,6 +25,21 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+/dev/null                 0666   root       root
+/dev/zero                 0666   root       root
+/dev/full                 0666   root       root
+/dev/ptmx                 0666   root       root
+/dev/tty                  0666   root       root
+/dev/random               0666   root       root
+/dev/urandom              0666   root       root
+
+/dev/ashmem               0666   root       root
+/dev/binder               0666   root       root
+/dev/tspdrv               0666   root       root
+/dev/ttyHSL0             0660   radio      system
+# logger should be world writable (for logging) but not readable
+/dev/log/*                0666   root       log
+
 # the DIAG device node is not world writable/readable.
 /dev/diag                 0660   system     qcom_diag
 /dev/ttydiag0             0660   system     qcom_diag