Merge "Let system_server writes to dumpstate.options property."
diff --git a/netd.te b/netd.te
index f360531..f01022a 100644
--- a/netd.te
+++ b/netd.te
@@ -70,8 +70,8 @@
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 talk to the framework service which collects netd events.
+allow netd netd_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};
diff --git a/service.te b/service.te
index 50aef26..9c8da49 100644
--- a/service.te
+++ b/service.te
@@ -47,10 +47,11 @@
type dbinfo_service, system_api_service, system_server_service, service_manager_type;
type device_policy_service, app_api_service, system_server_service, service_manager_type;
type deviceidle_service, app_api_service, system_server_service, service_manager_type;
+type device_identifiers_service, app_api_service, system_server_service, service_manager_type;
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 netd_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 c0dfd2b..6111c37 100644
--- a/service_contexts
+++ b/service_contexts
@@ -30,12 +30,13 @@
cpuinfo u:object_r:cpuinfo_service:s0
dbinfo u:object_r:dbinfo_service:s0
device_policy u:object_r:device_policy_service:s0
+device_identifiers u:object_r:device_identifiers_service:s0
deviceidle u:object_r:deviceidle_service:s0
devicestoragemonitor u:object_r:devicestoragemonitor_service:s0
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
+netd_listener u:object_r:netd_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