shinano-common: init: Reorder services startup

 * Some services where started too early and caused unexpected
   behaviors. Encrypt the device broke ril, sometimes initcredmgrd
   start after other criticals services.
   Moves those services to late_start class.
 * Remove uneeded class on disabled services.

Change-Id: I5a0b7175ee3c73b62ed79adf0c35d0ea8c4f0844

2 files changed, 5 insertions, 13 deletions

diff --git a/rootdir/init.camera.rc b/rootdir/init.camera.rc
index ce25789..b97bd37 100644
--- a/rootdir/init.camera.rc
+++ b/rootdir/init.camera.rc
@@ -38,7 +38,6 @@ on early-boot
     #SONY early boot
     start ta_qmi_service
     start sct_service
-    start mlog_qmi_service
 
 on boot
     # PM8941 flash
@@ -96,9 +95,6 @@ on post-fs-data
 
     # SONY: Import MiscTA to System properties
     exec -- /system/bin/taimport property
-
-    #Wait /data to init credmgrd
-    start initcredmgr
  
 service taimport /system/bin/taimport
     class late_start
@@ -113,7 +109,7 @@ service iddd /system/bin/iddd
 
 # This script init /cache/CredentialManagerData if /data/credmgr doesn't meet our requirements
 service initcredmgr /system/bin/credmgrfirstboot.sh
-    class main
+    class late_start
     user system
     group credmgr_client
     oneshot
@@ -177,7 +173,6 @@ service tad_static /sbin/tad_static /dev/block/bootdevice/by-name/TA 0,16
     socket tad stream 0770 system trimarea
 # tad_static is in rootfs, normal file_context does not work
     seclabel u:r:tad:s0
-
 service updatemiscta /system/bin/updatemiscta
     class main
     user updatemiscta
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index fbcd022..5204ae8 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -408,8 +408,9 @@ service macaddrsetup /system/bin/macaddrsetup /sys/devices/platform/bcmdhd_wlan/
     class late_start
     user root
     oneshot
+
 service netmgrd /system/bin/netmgrd
-    class main
+    class late_start
 
 on property:ro.radio.noril=true
     stop ril-daemon
@@ -481,9 +482,8 @@ service suntrold /system/bin/suntrold
 
 # Modem Log QMI service
 service mlog_qmi_service /system/bin/mlog_qmi_service
+	class late_start
     user root
-    class main
-    disabled
 
 # Thermal Manager service
 service thermanager /system/bin/thermanager /system/etc/thermanager.xml
@@ -567,13 +567,12 @@ service mediadrm /system/bin/mediadrmserver
     seclabel u:r:uim:s0
 
 service imsqmidaemon /system/bin/imsqmidaemon
-    class main
+    class late_start
     user system
     socket ims_qmid stream 0660 system radio
     group radio net_raw log qcom_diag
 
 service imsdatadaemon /system/bin/imsdatadaemon
-    class main
     user system
     socket ims_datad stream 0660 system radio
     group system wifi radio inet net_raw log qcom_diag net_admin
@@ -585,14 +584,12 @@ on property:sys.ims.DATA_DAEMON_STATUS=1
 
 
 service ims_rtp_daemon /system/bin/ims_rtp_daemon
-   class main
    user system
    socket ims_rtpd stream 0660 system radio
    group radio net_raw diag qcom_diag log inet
    disabled
 
 service imscmservice /system/bin/imscmservice
-   class main
    user system
    group radio net_raw diag qcom_diag log
    disabled