Merge "Unify dumped native stack traces" into nyc-dev
diff --git a/audioserver.te b/audioserver.te
index 0865497..ea7f6d9 100644
--- a/audioserver.te
+++ b/audioserver.te
@@ -15,11 +15,14 @@
allow audioserver ion_device:chr_file r_file_perms;
allow audioserver system_file:dir r_dir_perms;
-# used for TEE sink - pcm capture for debug.
userdebug_or_eng(`
+ # used for TEE sink - pcm capture for debug.
allow audioserver media_data_file:dir create_dir_perms;
allow audioserver audioserver_data_file:dir create_dir_perms;
allow audioserver audioserver_data_file:file create_file_perms;
+
+ # ptrace to processes in the same domain for memory leak detection
+ allow audioserver self:process ptrace;
')
allow audioserver audio_device:dir r_dir_perms;
diff --git a/mediaserver.te b/mediaserver.te
index c6ec3ff..21f16f4 100644
--- a/mediaserver.te
+++ b/mediaserver.te
@@ -15,6 +15,11 @@
# open /vendor/lib/mediadrm
allow mediaserver system_file:dir r_dir_perms;
+userdebug_or_eng(`
+ # ptrace to processes in the same domain for memory leak detection
+ allow mediaserver self:process ptrace;
+')
+
binder_use(mediaserver)
binder_call(mediaserver, binderservicedomain)
binder_call(mediaserver, { appdomain autoplay_app })
diff --git a/netd.te b/netd.te
index 51445fc..6864ad6 100644
--- a/netd.te
+++ b/netd.te
@@ -65,6 +65,9 @@
allow netd system_server:binder call;
allow netd permission_service:service_manager find;
+# Allow netd to talk to the framework service which collects DNS query metrics.
+allow netd dns_listener_service:service_manager find;
+
# Allow netd to operate on sockets that are passed to it.
allow netd netdomain:{tcp_socket udp_socket rawip_socket dccp_socket tun_socket} {read write getattr setattr getopt setopt};
allow netd netdomain:fd use;
diff --git a/service.te b/service.te
index 3cd258b..8fea071 100644
--- a/service.te
+++ b/service.te
@@ -49,6 +49,7 @@
type devicestoragemonitor_service, system_server_service, service_manager_type;
type diskstats_service, system_api_service, system_server_service, service_manager_type;
type display_service, app_api_service, system_server_service, service_manager_type;
+type dns_listener_service, system_server_service, service_manager_type;
type DockObserver_service, system_server_service, service_manager_type;
type dreams_service, app_api_service, system_server_service, service_manager_type;
type dropbox_service, app_api_service, system_server_service, service_manager_type;
diff --git a/service_contexts b/service_contexts
index 288ff90..11c0736 100644
--- a/service_contexts
+++ b/service_contexts
@@ -34,6 +34,7 @@
diskstats u:object_r:diskstats_service:s0
display.qservice u:object_r:surfaceflinger_service:s0
display u:object_r:display_service:s0
+dns_listener u:object_r:dns_listener_service:s0
DockObserver u:object_r:DockObserver_service:s0
dreams u:object_r:dreams_service:s0
drm.drmManager u:object_r:drmserver_service:s0