Merge "Add PLATFORM_SEPOLICY_VERSION."
diff --git a/private/file_contexts b/private/file_contexts
index adae7dc..713c625 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -91,7 +91,6 @@
/dev/ion u:object_r:ion_device:s0
/dev/keychord u:object_r:keychord_device:s0
/dev/kmem u:object_r:kmem_device:s0
-/dev/log(/.*)? u:object_r:log_device:s0
/dev/loop-control u:object_r:loop_control_device:s0
/dev/mem u:object_r:kmem_device:s0
/dev/modem.* u:object_r:radio_device:s0
diff --git a/private/system_server.te b/private/system_server.te
index 8f85a48..549ace6 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -18,6 +18,10 @@
# For art.
allow system_server dalvikcache_data_file:dir r_dir_perms;
allow system_server dalvikcache_data_file:file { r_file_perms execute };
+userdebug_or_eng(`
+ # Report dalvikcache_data_file:file execute violations.
+ auditallow system_server dalvikcache_data_file:file execute;
+')
# /data/resource-cache
allow system_server resourcecache_data_file:file r_file_perms;
diff --git a/public/device.te b/public/device.te
index 0f64bfa..475948d 100644
--- a/public/device.te
+++ b/public/device.te
@@ -30,7 +30,6 @@
type input_device, dev_type;
type kmem_device, dev_type;
type port_device, dev_type;
-type log_device, dev_type, mlstrustedobject;
type mtd_device, dev_type;
type mtp_device, dev_type, mlstrustedobject;
type nfc_device, dev_type;