Merge "Allow to signal perfetto from shell."
am: b209cb9670
Change-Id: I1cab94e3aff6fdb2502b40d275c413b24469205f
diff --git a/private/compat/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil
index 588c138..d3a6982 100644
--- a/private/compat/26.0/26.0.ignore.cil
+++ b/private/compat/26.0/26.0.ignore.cil
@@ -30,7 +30,6 @@
broadcastradio_service
cgroup_bpf
color_display_service
- content_capture_service
crossprofileapps_service
ctl_interface_restart_prop
ctl_interface_start_prop
@@ -97,6 +96,7 @@
heapprofd_socket
incident_helper
incident_helper_exec
+ intelligence_service
iorapd
iorapd_data_file
iorapd_exec
diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil
index e63d226..764a9ea 100644
--- a/private/compat/27.0/27.0.ignore.cil
+++ b/private/compat/27.0/27.0.ignore.cil
@@ -28,7 +28,6 @@
bpfloader_exec
cgroup_bpf
color_display_service
- content_capture_service
crossprofileapps_service
ctl_interface_restart_prop
ctl_interface_start_prop
@@ -88,6 +87,7 @@
heapprofd_socket
incident_helper
incident_helper_exec
+ intelligence_service
iorapd
iorapd_data_file
iorapd_exec
diff --git a/private/compat/28.0/28.0.ignore.cil b/private/compat/28.0/28.0.ignore.cil
index 1b07deb..51c22b1 100644
--- a/private/compat/28.0/28.0.ignore.cil
+++ b/private/compat/28.0/28.0.ignore.cil
@@ -18,7 +18,6 @@
apexd_prop
apexd_tmpfs
biometric_service
- content_capture_service
cpu_variant_prop
dev_cpu_variant
device_config_boot_count_prop
@@ -45,6 +44,7 @@
heapprofd_prop
heapprofd_socket
idmap_service
+ intelligence_service
iris_service
iris_vendor_data_file
llkd
diff --git a/private/service_contexts b/private/service_contexts
index 9fe7855..3bd5bdf 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -32,7 +32,6 @@
connmetrics u:object_r:connmetrics_service:s0
consumer_ir u:object_r:consumer_ir_service:s0
content u:object_r:content_service:s0
-content_capture u:object_r:content_capture_service:s0
contexthub u:object_r:contexthub_service:s0
country_detector u:object_r:country_detector_service:s0
coverage u:object_r:coverage_service:s0
@@ -81,6 +80,7 @@
iphonesubinfo u:object_r:radio_service:s0
ims u:object_r:radio_service:s0
imms u:object_r:imms_service:s0
+intelligence u:object_r:intelligence_service:s0
ipsec u:object_r:ipsec_service:s0
iris u:object_r:iris_service:s0
isms_msim u:object_r:radio_service:s0
diff --git a/public/service.te b/public/service.te
index c244c0c..d4d2ec9 100644
--- a/public/service.te
+++ b/public/service.te
@@ -65,7 +65,6 @@
type connectivity_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
type connmetrics_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
type consumer_ir_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-type content_capture_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
type content_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
type country_detector_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
# Note: The coverage_service should only be enabled for userdebug / eng builds that were compiled
@@ -100,6 +99,7 @@
type imms_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
type input_method_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
type input_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
+type intelligence_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
type ipsec_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
type iris_service, app_api_service, system_server_service, service_manager_type;
type jobscheduler_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;