resolved conflicts for merge of 6a949b45 to master

Change-Id: Ie123b4fff76ef43e2b1c0583731e88997504320e
This commit is contained in:
Narayan Kamath 2014-04-01 17:40:45 +01:00
commit dc9af896f0
3 changed files with 17 additions and 8 deletions

View file

@ -7,6 +7,7 @@
import /init.environ.rc
import /init.usb.rc
import /init.${ro.hardware}.rc
import /init.${ro.zygote}.rc
import /init.trace.rc
on early-init
@ -534,14 +535,6 @@ service inputflinger /system/bin/inputflinger
group input
onrestart restart zygote
service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-system-server
class main
socket zygote stream 660 root system
onrestart write /sys/android_power/request_state wake
onrestart write /sys/power/state on
onrestart restart media
onrestart restart netd
service drm /system/bin/drmserver
class main
user drm

8
rootdir/init.zygote32.rc Normal file
View file

@ -0,0 +1,8 @@
service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-system-server
class main
socket zygote stream 660 root system
onrestart write /sys/android_power/request_state wake
onrestart write /sys/power/state on
onrestart restart media
onrestart restart netd

8
rootdir/init.zygote64.rc Normal file
View file

@ -0,0 +1,8 @@
service zygote /system/bin/app_process64 -Xzygote /system/bin --zygote --start-system-server
class main
socket zygote stream 660 root system
onrestart write /sys/android_power/request_state wake
onrestart write /sys/power/state on
onrestart restart media
onrestart restart netd