Merge "Allow vndservicemanager to self-register." am: 48eed15c35
Change-Id: I29a24050637dd352139a5aed75ce0567abb962a8
diff --git a/private/compat/29.0/29.0.ignore.cil b/private/compat/29.0/29.0.ignore.cil
index 3e90ec2..9c5deb0 100644
--- a/private/compat/29.0/29.0.ignore.cil
+++ b/private/compat/29.0/29.0.ignore.cil
@@ -82,6 +82,7 @@
art_apex_dir
rebootescrow_hal_prop
service_manager_service
+ service_manager_vndservice
simpleperf
snapshotctl_log_data_file
socket_hook_prop
@@ -111,4 +112,5 @@
vendor_install_recovery
vendor_install_recovery_exec
vendor_socket_hook_prop
+ vendor_socket_hook_prop
virtual_ab_prop))
diff --git a/public/vndservice.te b/public/vndservice.te
index 0d309bf..efd9adf 100644
--- a/public/vndservice.te
+++ b/public/vndservice.te
@@ -1 +1,2 @@
+type service_manager_vndservice, vndservice_manager_type;
type default_android_vndservice, vndservice_manager_type;
diff --git a/vendor/vndservice_contexts b/vendor/vndservice_contexts
index 4cca2fb..068056f 100644
--- a/vendor/vndservice_contexts
+++ b/vendor/vndservice_contexts
@@ -1 +1,2 @@
+manager u:object_r:service_manager_vndservice:s0
* u:object_r:default_android_vndservice:s0
diff --git a/vendor/vndservicemanager.te b/vendor/vndservicemanager.te
index 6e5c391..497e027 100644
--- a/vendor/vndservicemanager.te
+++ b/vendor/vndservicemanager.te
@@ -13,6 +13,8 @@
# Read vndservice_contexts
allow vndservicemanager vndservice_contexts_file:file r_file_perms;
+add_service(vndservicemanager, service_manager_vndservice)
+
# Start lazy services
set_prop(vndservicemanager, ctl_interface_start_prop)