Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc9af896 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

resolved conflicts for merge of 6a949b45 to master 

Change-Id: Ie123b4fff76ef43e2b1c0583731e88997504320e
parents 89086df2 6a949b45

rootdir/init.rc

+1 −8
Original line number Diff line number Diff line
@@ -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

rootdir/init.zygote32.rc

0 → 100644
+8 −0
Original line number Diff line number Diff line 
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

rootdir/init.zygote64.rc

0 → 100644
+8 −0
Original line number Diff line number Diff line 
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