shinano-common: clean up init scripts

Change-Id: Ide69b8924d76154e6a7bfeb7c4b86d58568f2b5b

2 files changed, 7 insertions, 60 deletions

diff --git a/rootdir/init.camera.rc b/rootdir/init.camera.rc
index 485da68..1d1acb3 100644
--- a/rootdir/init.camera.rc
+++ b/rootdir/init.camera.rc
@@ -131,16 +131,6 @@ service credmgrd /system/bin/credmgrd
     class main
     disabled
 
-#doesn't exist on shinano. Keept for compat purpose
-# Start Security Daemon
-service secd /system/bin/secd
-    user system
-    group system
-    socket secd_ebl_sock stream 0660 system credmgr_client
-    socket secd_devsec_sock stream 0660 system credmgr_client
-    socket secd_credmgr_sock stream 0660 system credmgr_client
-    class main
-
 # Secure Config Transfer service
 service sct_service /system/bin/sct_service
     user root
@@ -157,13 +147,6 @@ service scd /system/bin/scd
     user system
     group system
 
-service scdnotifier_nitz /system/bin/scdnotifier nitz
-    class main
-    user system
-    group system
-    oneshot
-    disabled
-
     # All services that use qseecomd daemon listeners should
     # start on sys.listeners.registered property to make sure that
     # all of its service listeners are registered before calling them
@@ -195,16 +178,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 cameraserver /system/bin/logwrapper /system/bin/cameraserver
-service cameraserver /system/bin/cameraserver
-    class main
-    user cameraserver
-    group camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct credmgr_client trimarea system audio
-#   group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct credmgr_client
-    ioprio rt 4
-#    seclabel u:r:cameraserver:s0
-    writepid /dev/cpuset/foreground/tasks
 
 service updatemiscta /system/bin/updatemiscta
     class main
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index 78ba414..bc27232 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -229,22 +229,6 @@ on boot
     write /proc/sys/net/ipv6/conf/rmnet5/accept_ra 2
     write /proc/sys/net/ipv6/conf/rmnet6/accept_ra 2
     write /proc/sys/net/ipv6/conf/rmnet7/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_sdio0/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_sdio1/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_sdio2/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_sdio3/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_sdio4/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_sdio5/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_sdio6/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_sdio7/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_usb0/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_usb1/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_usb2/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_usb3/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_usb0/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_usb1/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_usb2/accept_ra 2
-    write /proc/sys/net/ipv6/conf/rmnet_usb3/accept_ra 2
 
     # To prevent out of order acknowledgements from making
     # connection tracking to treat them as not belonging to
@@ -279,11 +263,6 @@ on boot
 on post-fs
     #export LD_PRELOAD libNimsWrap.so
 
-    # MHL driver. To support MHL power off charge,
-    # the insmod must be done before chargemon.
-    insmod /system/lib/modules/mhl_sii8620_8061_drv.ko
-
-    exec /system/bin/chargemon
     write /sys/class/power_supply/battery/shutdown_at_low_batt 1
 
     # Change to socket location on libkeyctrl/suntory for /data encryption
@@ -444,12 +423,6 @@ on property:ro.radio.noril=true
     stop ril-daemon
     stop netmgrd
 
-# start GNS/Sensor interface daemon
-service gsiff_daemon /system/bin/gsiff_daemon
-    class late_start
-    user gps
-    group gps net_raw misc
-
 service qseecomd /system/bin/qseecomd
     class core
     user root
@@ -547,6 +520,13 @@ service loc_launcher /system/bin/loc_launcher
     class late_start
     group gps qcom_oncrpc inet net_raw qcom_diag net_admin wifi
 
+service scdnotifier_nitz /system/bin/scdnotifier nitz
+    class main
+    user system
+    group system
+    oneshot
+    disabled
+
 on property:gsm.nitz.time=*
     start scdnotifier_nitz
 
@@ -657,12 +637,6 @@ service mediadrm /system/bin/mediadrmserver
     group bluetooth net_bt_admin net_bt
     seclabel u:r:uim:s0
 
-service ptt_socket_app /system/bin/ptt_socket_app
-    class main
-    user system
-    group system
-    oneshot
-
 service imsqmidaemon /system/bin/imsqmidaemon
     class main
     user system