merge in nougat-mr1-cts-release history after reset to nougat-mr1-cts-dev
diff --git a/bluetooth.te b/bluetooth.te
index 4b20a58..a5b4d71 100644
--- a/bluetooth.te
+++ b/bluetooth.te
@@ -8,6 +8,8 @@
# Data file accesses.
allow bluetooth bluetooth_data_file:dir create_dir_perms;
allow bluetooth bluetooth_data_file:notdevfile_class_set create_file_perms;
+allow bluetooth bluetooth_logs_data_file:dir rw_dir_perms;
+allow bluetooth bluetooth_logs_data_file:file create_file_perms;
# Socket creation under /data/misc/bluedroid.
type_transition bluetooth bluetooth_data_file:sock_file bluetooth_socket;
diff --git a/file.te b/file.te
index 84af4a7..87cec82 100644
--- a/file.te
+++ b/file.te
@@ -138,6 +138,7 @@
type audio_data_file, file_type, data_file_type;
type audioserver_data_file, file_type, data_file_type;
type bluetooth_data_file, file_type, data_file_type;
+type bluetooth_logs_data_file, file_type, data_file_type;
type bootstat_data_file, file_type, data_file_type;
type boottrace_data_file, file_type, data_file_type;
type camera_data_file, file_type, data_file_type;
diff --git a/file_contexts b/file_contexts
index 3448f21..085a57b 100644
--- a/file_contexts
+++ b/file_contexts
@@ -274,6 +274,7 @@
/data/misc/bootstat(/.*)? u:object_r:bootstat_data_file:s0
/data/misc/boottrace(/.*)? u:object_r:boottrace_data_file:s0
/data/misc/bluetooth(/.*)? u:object_r:bluetooth_data_file:s0
+/data/misc/bluetooth/logs(/.*)? u:object_r:bluetooth_logs_data_file:s0
/data/misc/bluedroid(/.*)? u:object_r:bluetooth_data_file:s0
/data/misc/bluedroid/\.a2dp_ctrl u:object_r:bluetooth_socket:s0
/data/misc/bluedroid/\.a2dp_data u:object_r:bluetooth_socket:s0
diff --git a/netd.te b/netd.te
index 9b44e4b..6302073 100644
--- a/netd.te
+++ b/netd.te
@@ -69,8 +69,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 e7a30f9..9a77ce2 100644
--- a/service.te
+++ b/service.te
@@ -50,7 +50,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 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 dd7e49f..fffbd4d 100644
--- a/service_contexts
+++ b/service_contexts
@@ -35,7 +35,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
+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
