commit 752bde548fa35c17528758931d1ab8593ae47368
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 12 19:19:57 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 12 19:19:57 2018 +0000
tree 890256926e59a2557f32e156e8959b46851fca81
parent 9099638815a5680b97a2a6fbcd91f82a2ad2ba0b
parent a1bce779735ef2b32608ae749d28b8120969183a

Merge "persist.sys.boot.reason is cleared once read by bootstat"

private/property_contexts

diff --git a/private/property_contexts b/private/property_contexts
index 32be0b3..8befae5 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -70,6 +70,7 @@
 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
+sys.boot.reason.last    u:object_r:last_boot_reason_prop:s0
 pm.                     u:object_r:pm_prop:s0
 test.sys.boot.reason    u:object_r:test_boot_reason_prop:s0
 

private/system_server.te

diff --git a/private/system_server.te b/private/system_server.te
index f74159e..d3b8bcd 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -524,8 +524,8 @@
 
 # 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)
+# PowerManager to read sys.boot.reason
+get_prop(system_server, system_boot_reason_prop)
 
 # Collect metrics on boot time created by init
 get_prop(system_server, boottime_prop)