diff --git a/private/file_contexts b/private/file_contexts
index ddf267b6e54e16c0109232635e75c24093710c40..0ec1715d5c59c419b948c5798e97ea548a2a0b87 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -370,7 +370,6 @@
/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
diff --git a/private/property_contexts b/private/property_contexts
index 3ca1d7064284878a859edddde7998bb096c10e55..2bbc3c5c7806a2e1f0c1eff21743e410c08539c2 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -65,6 +65,9 @@ ro.serialno u:object_r:serialno_prop:s0
ro.boot.btmacaddr u:object_r:bluetooth_prop:s0
ro.boot.serialno u:object_r:serialno_prop:s0
ro.bt. u:object_r:bluetooth_prop:s0
+ro.boot.bootreason u:object_r:bootloader_boot_reason_prop:s0
+persist.sys.boot.reason u:object_r:last_boot_reason_prop:s0
+sys.boot.reason u:object_r:system_boot_reason_prop:s0
# Boolean property set by system server upon boot indicating
# if device owner is provisioned.
diff --git a/private/system_server.te b/private/system_server.te
index a8d57d74c832127b471071d7419abba2bff0503e..c532461c337444d711d353939e7aa7503447ba08 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -29,10 +29,6 @@ allow system_server resourcecache_data_file:dir r_dir_perms;
# ptrace to processes in the same domain for debugging crashes.
allow system_server self:process ptrace;
-# Read and delete last_reboot_reason file
-allow system_server reboot_data_file:file { rename r_file_perms unlink };
-allow system_server reboot_data_file:dir { write search open remove_name };
-
# Child of the zygote.
allow system_server zygote:fd use;
allow system_server zygote:process sigchld;
@@ -479,6 +475,11 @@ set_prop(system_server, ctl_bugreport_prop)
# cppreopt property
set_prop(system_server, cppreopt_prop)
+# BootReceiver to read ro.boot.bootreason
+get_prop(system_server, bootloader_boot_reason_prop)
+# PowerManager to read persist.sys.boot.reason
+get_prop(system_server, last_boot_reason_prop)
+
# Collect metrics on boot time created by init
get_prop(system_server, boottime_prop)
diff --git a/public/bootanim.te b/public/bootanim.te
index e2584c3b45b372ed03b7f35e9b5c210a1ef083f7..7e16047508e6268fa2b71d6b32eabae03a50e762 100644
--- a/public/bootanim.te
+++ b/public/bootanim.te
@@ -38,3 +38,7 @@ r_dir_file(bootanim, cgroup)
# System file accesses.
allow bootanim system_file:dir r_dir_perms;
+
+# Read ro.boot.bootreason b/30654343
+get_prop(bootanim, bootloader_boot_reason_prop)
+
diff --git a/public/bootstat.te b/public/bootstat.te
index f5c7268e0be590f2a1dd1920baf50bc8d2833724..b09e77fa5f67c7b1db3db320a58008fbc9b0dde1 100644
--- a/public/bootstat.te
+++ b/public/bootstat.te
@@ -13,3 +13,6 @@ r_dir_file(bootstat, proc)
# Collect metrics on boot time created by init
get_prop(bootstat, boottime_prop)
+
+# Read ro.boot.bootreason
+get_prop(bootstat, bootloader_boot_reason_prop)
diff --git a/public/dumpstate.te b/public/dumpstate.te
index f6d6a0a69d9da541b94af9a0f8d745f0e76a800e..3d80495189f54f25d29b2e93400932ca91b40d04 100644
--- a/public/dumpstate.te
+++ b/public/dumpstate.te
@@ -204,6 +204,11 @@ get_prop(dumpstate, serialno_prop)
# Read state of logging-related properties
get_prop(dumpstate, device_logging_prop)
+# Read state of boot reason properties
+get_prop(dumpstate, bootloader_boot_reason_prop)
+get_prop(dumpstate, last_boot_reason_prop)
+get_prop(dumpstate, system_boot_reason_prop)
+
# Access to /data/media.
# This should be removed if sdcardfs is modified to alter the secontext for its
# accesses to the underlying FS.
diff --git a/public/property.te b/public/property.te
index 4cc2701315a34dd4f7a31b7b794d4abe53e25fda..74fd30d3f46ef819e7b62e1f91cdda4efbbe2b6f 100644
--- a/public/property.te
+++ b/public/property.te
@@ -2,6 +2,7 @@ type asan_reboot_prop, property_type; # TODO - remove (b/38241921)
type audio_prop, property_type, core_property_type;
type boottime_prop, property_type;
type bluetooth_prop, property_type;
+type bootloader_boot_reason_prop, property_type;
type config_prop, property_type, core_property_type;
type cppreopt_prop, property_type, core_property_type;
type ctl_bootanim_prop, property_type;
@@ -24,6 +25,7 @@ type ffs_prop, property_type, core_property_type;
type fingerprint_prop, property_type, core_property_type;
type firstboot_prop, property_type;
type hwservicemanager_prop, property_type;
+type last_boot_reason_prop, property_type;
type logd_prop, property_type, core_property_type;
type logpersistd_logging_prop, property_type;
type log_prop, property_type, log_property_type;
@@ -43,6 +45,7 @@ type restorecon_prop, property_type, core_property_type;
type safemode_prop, property_type;
type serialno_prop, property_type;
type shell_prop, property_type, core_property_type;
+type system_boot_reason_prop, property_type;
type system_prop, property_type, core_property_type;
type system_radio_prop, property_type, core_property_type;
type vold_prop, property_type, core_property_type;
diff --git a/public/recovery.te b/public/recovery.te
index 3be1f465b531d27b8de9a10604c3f53c879a4d5e..ad8ffb71e2f66895c05bb8960c5ef115c5bb6b0b 100644
--- a/public/recovery.te
+++ b/public/recovery.te
@@ -118,6 +118,9 @@ recovery_only(`
# Set sys.usb.ffs.ready when starting minadbd for sideload.
set_prop(recovery, ffs_prop)
+ # Read ro.boot.bootreason
+ get_prop(recovery, bootloader_boot_reason_prop)
+
# Use setfscreatecon() to label files for OTA updates.
allow recovery self:process setfscreate;
diff --git a/public/shell.te b/public/shell.te
index 9540cca029f75a68082361ed53d90d9dab114136..36964e50f57eb90240f1140a6073ed0d21e28fd8 100644
--- a/public/shell.te
+++ b/public/shell.te
@@ -79,6 +79,11 @@ get_prop(shell, serialno_prop)
# Read state of logging-related properties
get_prop(shell, device_logging_prop)
+# Read state of boot reason properties
+get_prop(shell, bootloader_boot_reason_prop)
+get_prop(shell, last_boot_reason_prop)
+get_prop(shell, system_boot_reason_prop)
+
# allow shell access to services
allow shell servicemanager:service_manager list;
# don't allow shell to access GateKeeper service