commit f3f194c09a7caf493bb43ac244e62658d19fbc47
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 09 23:31:25 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 09 23:31:25 2017 +0000
tree a9aa2b2aba5e8279a31f4dbd1fd723368e5e22eb
parent f7196a885d206854c3222fb4c4bcd322607b7ecc
parent 76d0e4180aa55d7c6b68cb0951d1efd19389d1a4

Merge "Remove reboot_data_file."

private/compat/26.0/26.0.cil

diff --git a/private/compat/26.0/26.0.cil b/private/compat/26.0/26.0.cil
index c60b2e6..7246b7f 100644
--- a/private/compat/26.0/26.0.cil
+++ b/private/compat/26.0/26.0.cil
@@ -7,6 +7,7 @@
 (type asan_reboot_prop)
 (type log_device)
 (type mediacasserver_service)
+(type reboot_data_file)
 (type tracing_shell_writable)
 (type tracing_shell_writable_debug)
 

public/file.te

diff --git a/public/file.te b/public/file.te
index 79435e5..bcd2fdd 100644
--- a/public/file.te
+++ b/public/file.te
@@ -208,7 +208,6 @@
 type net_data_file, file_type, data_file_type, core_data_file_type;
 type nfc_data_file, file_type, data_file_type, core_data_file_type;
 type radio_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-type reboot_data_file, file_type, data_file_type, core_data_file_type;
 type recovery_data_file, file_type, data_file_type, core_data_file_type;
 type shared_relro_file, file_type, data_file_type, core_data_file_type;
 type systemkeys_data_file, file_type, data_file_type, core_data_file_type;