commit bbdf8e4d95b432dffcca4b25530ecfd761f43025
author Nikita Ioffe <ioffe@google.com> Mon Apr 13 19:14:56 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 13 19:14:56 2020 +0000
tree b927b7e4f269e10121e89bd02989741d5439d3ed
parent d107a05402c55dbd2535e1762590898c726c3a27
parent 7947d580e3bfc4b129b955bfd2a0975ebfcea6db

Merge "Add init.userspace_reboot.started.timeoutmillis property"

private/property_contexts

diff --git a/private/property_contexts b/private/property_contexts
index 7af86be..a63ac64 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -22,6 +22,7 @@
 hw.                     u:object_r:system_prop:s0
 ro.hw.                  u:object_r:system_prop:s0
 sys.                    u:object_r:system_prop:s0
+sys.audio.              u:object_r:audio_prop:s0
 sys.init.perf_lsm_hooks u:object_r:init_perf_lsm_hooks_prop:s0
 sys.cppreopt            u:object_r:cppreopt_prop:s0
 sys.lpdumpd             u:object_r:lpdumpd_prop:s0

private/system_server.te

diff --git a/private/system_server.te b/private/system_server.te
index 075c9af..6c1fa9a 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -619,6 +619,7 @@
 set_prop(system_server, pm_prop)
 set_prop(system_server, exported_pm_prop)
 set_prop(system_server, socket_hook_prop)
+set_prop(system_server, audio_prop)
 userdebug_or_eng(`set_prop(system_server, wifi_log_prop)')
 
 # ctl interface