Merge "Revert "Introducing vm_tethering_service as system_server_service"" into main
diff --git a/build/soong/selinux_contexts.go b/build/soong/selinux_contexts.go
index d0bbc28..a65de35 100644
--- a/build/soong/selinux_contexts.go
+++ b/build/soong/selinux_contexts.go
@@ -255,7 +255,7 @@
return nil
}
-func (m *selinuxContextsModule) SetImageVariation(ctx android.BaseModuleContext, variation string, module android.Module) {
+func (m *selinuxContextsModule) SetImageVariation(ctx android.BaseModuleContext, variation string) {
}
var _ android.ImageInterface = (*selinuxContextsModule)(nil)
@@ -730,7 +730,7 @@
return nil
}
-func (m *contextsTestModule) SetImageVariation(ctx android.BaseModuleContext, variation string, module android.Module) {
+func (m *contextsTestModule) SetImageVariation(ctx android.BaseModuleContext, variation string) {
}
var _ android.ImageInterface = (*contextsTestModule)(nil)
diff --git a/contexts/plat_file_contexts_test b/contexts/plat_file_contexts_test
index a0933b4..0bd8e07 100644
--- a/contexts/plat_file_contexts_test
+++ b/contexts/plat_file_contexts_test
@@ -407,6 +407,7 @@
/system/bin/traced traced_exec
/system/bin/traced_perf traced_perf_exec
/system/bin/traced_probes traced_probes_exec
+/system/bin/traced_relay traced_exec
/system/bin/heapprofd heapprofd_exec
/system/bin/uncrypt uncrypt_exec
/system/bin/update_verifier update_verifier_exec
diff --git a/private/file_contexts b/private/file_contexts
index ffc06f2..f0832f3 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -339,6 +339,7 @@
/system/bin/traced u:object_r:traced_exec:s0
/system/bin/traced_perf u:object_r:traced_perf_exec:s0
/system/bin/traced_probes u:object_r:traced_probes_exec:s0
+/system/bin/traced_relay u:object_r:traced_exec:s0
/system/bin/trace_redactor u:object_r:trace_redactor_exec:s0
/system/bin/heapprofd u:object_r:heapprofd_exec:s0
/system/bin/uncrypt u:object_r:uncrypt_exec:s0
diff --git a/private/gmscore_app.te b/private/gmscore_app.te
index 859c2ec..f938ad5 100644
--- a/private/gmscore_app.te
+++ b/private/gmscore_app.te
@@ -136,6 +136,10 @@
allow gmscore_app shell_data_file:file r_file_perms;
allow gmscore_app shell_data_file:dir r_dir_perms;
+# allow gms core app write to aconfigd socket
+allow gmscore_app aconfigd_socket:sock_file {read write};
+allow gmscore_app aconfigd:unix_stream_socket connectto;
+
# b/18504118: Allow reads from /data/anr/traces.txt
allow gmscore_app anr_data_file:file r_file_perms;
diff --git a/private/virtual_camera.te b/private/virtual_camera.te
index 27c5df9..6b3be0c 100644
--- a/private/virtual_camera.te
+++ b/private/virtual_camera.te
@@ -40,6 +40,7 @@
# Allow virtual_camera to use GPU
allow virtual_camera gpu_device:chr_file rw_file_perms;
allow virtual_camera gpu_device:dir r_dir_perms;
+allow virtual_camera sysfs_gpu:file r_file_perms;
# Allow virtual camera to use graphics composer fd-s (fences).
allow virtual_camera hal_graphics_composer:fd use;