commit fb03f7cda0e7298b1335a449003898644ef10677
author Jeff Vander Stoep <jeffv@google.com> Wed Feb 15 00:05:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 15 00:05:47 2017 +0000
tree ca8a2d528d8a7b9de96277404d5535f0fb2860c5
parent 4abad75b216d51ded8616f2e5f8d330ea7992a03
parent e68f6fe4018fe3415cf729470b63acd6e7525c0f

Merge changes from topic 'selinux-targetSdkVersion' am: fb6783391e am: d16878f98c am: a245e8b1ba
am: e68f6fe401

Change-Id: I1c41631e19d8dc837c21f7748634f96d1ab0c994

private/file_contexts

diff --git a/private/file_contexts b/private/file_contexts
index 31e813e..8cd8123 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -317,6 +317,7 @@
 /data/misc/logd(/.*)?           u:object_r:misc_logd_file:s0
 /data/misc/media(/.*)?          u:object_r:media_data_file:s0
 /data/misc/net(/.*)?            u:object_r:net_data_file:s0
+/data/misc/reboot(/.*)?         u:object_r:reboot_data_file:s0
 /data/misc/recovery(/.*)?       u:object_r:recovery_data_file:s0
 /data/misc/shared_relro(/.*)?   u:object_r:shared_relro_file:s0
 /data/misc/sms(/.*)?            u:object_r:radio_data_file:s0

public/bootanim.te

diff --git a/public/bootanim.te b/public/bootanim.te
index 71f9280..3e0af8e 100644
--- a/public/bootanim.te
+++ b/public/bootanim.te
@@ -17,7 +17,6 @@
 
 allow bootanim audioserver_service:service_manager find;
 allow bootanim surfaceflinger_service:service_manager find;
-allow bootanim audioserver_service:service_manager find;
 
 # Allow access to ion memory allocation device
 allow bootanim ion_device:chr_file rw_file_perms;

public/file.te

diff --git a/public/file.te b/public/file.te
index cd646f5..5cbc75a 100644
--- a/public/file.te
+++ b/public/file.te
@@ -167,6 +167,7 @@
 type net_data_file, file_type, data_file_type;
 type nfc_data_file, file_type, data_file_type;
 type radio_data_file, file_type, data_file_type, mlstrustedobject;
+type reboot_data_file, file_type, data_file_type;
 type recovery_data_file, file_type, data_file_type;
 type shared_relro_file, file_type, data_file_type;
 type systemkeys_data_file, file_type, data_file_type;