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

Commit bdef5499 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

resolved conflicts for merge of f8f0531b to klp-modular-dev-plus-aosp

Change-Id: I87228aa0dbd0b909437c85812f2404ca8be39f38
parents abf08537 f8f0531b
Loading
Loading
Loading
Loading
+7 −11
Original line number Diff line number Diff line
@@ -438,6 +438,13 @@ service ueventd /sbin/ueventd
    critical
    seclabel u:r:ueventd:s0

service logd /system/bin/logd
    class core
    socket logd stream 0666 logd logd
    socket logdr seqpacket 0666 logd logd
    socket logdw dgram 0222 logd logd
    seclabel u:r:logd:s0

service healthd /sbin/healthd
    class core
    critical
@@ -470,17 +477,6 @@ service adbd /sbin/adbd --root_seclabel=u:r:su:s0
on property:ro.kernel.qemu=1
    start adbd

service lmkd /system/bin/lmkd
    class core
    critical
    socket lmkd seqpacket 0660 system system

service logd /system/bin/logd
    class main
    socket logd stream 0666 logd logd
    socket logdr seqpacket 0666 logd logd
    socket logdw dgram 0222 logd logd

service servicemanager /system/bin/servicemanager
    class core
    user system