Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: Ib9f0a43dfd2ffbd9729b56b12a12ffaa74f2b7a1
Change-Id: Ifc5cc7c0acc0318a4854b280f0fa95b7ea273af8
diff --git a/turbo_adapter/seapp_contexts b/turbo_adapter/private/seapp_contexts
similarity index 100%
rename from turbo_adapter/seapp_contexts
rename to turbo_adapter/private/seapp_contexts
diff --git a/turbo_adapter/turbo_adapter.te b/turbo_adapter/private/turbo_adapter.te
similarity index 93%
rename from turbo_adapter/turbo_adapter.te
rename to turbo_adapter/private/turbo_adapter.te
index 63cb193..5eb76c1 100644
--- a/turbo_adapter/turbo_adapter.te
+++ b/turbo_adapter/private/turbo_adapter.te
@@ -2,7 +2,7 @@
# this means that TurboAdapter doesn't get the platform_app permissions any more, so we need to
# list everything that it needs here.
-type turbo_adapter, domain, coredomain, system_suspend_internal_server;
+typeattribute turbo_adapter coredomain, system_suspend_internal_server;
app_domain(turbo_adapter)
diff --git a/turbo_adapter/public/turbo_adapter.te b/turbo_adapter/public/turbo_adapter.te
new file mode 100644
index 0000000..ef2ec65
--- /dev/null
+++ b/turbo_adapter/public/turbo_adapter.te
@@ -0,0 +1 @@
+type turbo_adapter, domain;
diff --git a/vibrator/cs40l26/file_contexts b/vibrator/cs40l26/file_contexts
index 5c9f669..fbbda2c 100644
--- a/vibrator/cs40l26/file_contexts
+++ b/vibrator/cs40l26/file_contexts
@@ -3,3 +3,6 @@
/dev/snd/pcmC0D24p u:object_r:vibrator_snd_device:s0
/dev/snd/pcmC1D24p u:object_r:vibrator_snd_device:s0
+
+/sys/module/cs40l26_core/version u:object_r:sysfs_vibrator:s0
+/sys/module/cl_dsp_core/version u:object_r:sysfs_vibrator:s0