resolved conflicts for merge of f8f0531b to klp-modular-dev-plus-aosp
Change-Id: I87228aa0dbd0b909437c85812f2404ca8be39f38
This commit is contained in:
commit
bdef5499d4
1 changed files with 7 additions and 11 deletions
|
|
@ -438,6 +438,13 @@ service ueventd /sbin/ueventd
|
||||||
critical
|
critical
|
||||||
seclabel u:r:ueventd:s0
|
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
|
service healthd /sbin/healthd
|
||||||
class core
|
class core
|
||||||
critical
|
critical
|
||||||
|
|
@ -470,17 +477,6 @@ service adbd /sbin/adbd --root_seclabel=u:r:su:s0
|
||||||
on property:ro.kernel.qemu=1
|
on property:ro.kernel.qemu=1
|
||||||
start adbd
|
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
|
service servicemanager /system/bin/servicemanager
|
||||||
class core
|
class core
|
||||||
user system
|
user system
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue