Merge "Allow dumpstate to kill dumpstate vendor HAL in timeout case" into pi-dev

am: d45dfbff95

Change-Id: I90a0270b7820073bcee257f5a11c1d2407f8d841
This commit is contained in:
Wei Wang 2018-04-23 21:27:17 -07:00 committed by android-build-merger
commit 5154fc1fb2
2 changed files with 4 additions and 0 deletions

View file

@ -94,6 +94,7 @@ ro.persistent_properties.ready u:object_r:persistent_properties_ready_prop:s0
# ctl properties
ctl.bootanim u:object_r:ctl_bootanim_prop:s0
ctl.android.hardware.dumpstate u:object_r:ctl_dumpstate_prop:s0
ctl.dumpstate u:object_r:ctl_dumpstate_prop:s0
ctl.fuse_ u:object_r:ctl_fuse_prop:s0
ctl.mdnsd u:object_r:ctl_mdnsd_prop:s0

View file

@ -267,6 +267,9 @@ allow dumpstate self:netlink_socket create_socket_perms_no_ioctl;
# newer kernels (e.g. 4.4) have a new class for sockets
allow dumpstate self:netlink_generic_socket create_socket_perms_no_ioctl;
# Allow dumpstate to kill vendor dumpstate service by init
set_prop(dumpstate, ctl_dumpstate_prop)
###
### neverallow rules
###