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

* commit 'bdef5499d4eb0c4f5e6853471373acd610798c7c':
  logd: core requirement
This commit is contained in:
Mark Salyzyn 2014-03-22 00:06:57 +00:00 committed by Android Git Automerger
commit 68b9d5f07a

View file

@ -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