Merge changes from topic "servicemanager-recovery"
* changes: servicemanager: recovery write to kmsg. Add recovery service_contexts files.
This commit is contained in:
commit
28f9b97646
3 changed files with 10 additions and 0 deletions
|
@ -594,18 +594,21 @@ property_contexts {
|
|||
service_contexts {
|
||||
name: "plat_service_contexts",
|
||||
srcs: [":service_contexts_files"],
|
||||
recovery_available: true,
|
||||
}
|
||||
|
||||
service_contexts {
|
||||
name: "system_ext_service_contexts",
|
||||
srcs: [":service_contexts_files"],
|
||||
system_ext_specific: true,
|
||||
recovery_available: true,
|
||||
}
|
||||
|
||||
service_contexts {
|
||||
name: "product_service_contexts",
|
||||
srcs: [":service_contexts_files"],
|
||||
product_specific: true,
|
||||
recovery_available: true,
|
||||
}
|
||||
|
||||
service_contexts {
|
||||
|
@ -613,6 +616,7 @@ service_contexts {
|
|||
srcs: [":service_contexts_files"],
|
||||
reqd_mask: true,
|
||||
soc_specific: true,
|
||||
recovery_available: true,
|
||||
}
|
||||
|
||||
keystore2_key_contexts {
|
||||
|
|
|
@ -15,6 +15,7 @@ recovery_only(`
|
|||
domain_trans(init, rootfs, fastbootd)
|
||||
domain_trans(init, rootfs, recovery)
|
||||
domain_trans(init, rootfs, linkerconfig)
|
||||
domain_trans(init, rootfs, servicemanager)
|
||||
domain_trans(init, rootfs, snapuserd)
|
||||
')
|
||||
domain_trans(init, shell_exec, shell)
|
||||
|
|
|
@ -30,3 +30,8 @@ allow servicemanager dumpstate:fifo_file write;
|
|||
|
||||
# Check SELinux permissions.
|
||||
selinux_check_access(servicemanager)
|
||||
|
||||
# In recovery, log to kmsg.
|
||||
recovery_only(`
|
||||
allow servicemanager kmsg_device:chr_file rw_file_perms;
|
||||
')
|
||||
|
|
Loading…
Reference in a new issue