From c2a470dafb871ddc94ebc0f89856e93ea5dffc70 Mon Sep 17 00:00:00 2001
From: Michal Karpinski <mkarpinski@google.com>
Date: Thu, 1 Sep 2016 10:08:57 +0100
Subject: [PATCH] DO NOT MERGE Change name in the rules after renaming
dns_listener -> netd_listener
(cherry picked from commit 59afa2414d3039c7290a66531a2a069cbb441886)
Bug: 29748723
Change-Id: I4737a087f2d00e1028d1cb43d9eda814a008dbe8
---
netd.te | 4 ++--
service.te | 2 +-
service_contexts | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/netd.te b/netd.te
index 9b44e4bdf..6302073de 100644
--- a/netd.te
+++ b/netd.te
@@ -69,8 +69,8 @@ allow netd dumpstate:fifo_file { getattr write };
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 e7a30f9f1..9a77ce270 100644
--- a/service.te
+++ b/service.te
@@ -50,7 +50,7 @@ type deviceidle_service, app_api_service, system_server_service, service_manager
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 dd7e49f58..fffbd4d3f 100644
--- a/service_contexts
+++ b/service_contexts
@@ -35,7 +35,7 @@ devicestoragemonitor u:object_r:devicestoragemonitor_servic
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
--
GitLab