commit 68bf668a62ec2cf6eead644a7616e15883b57fcf
author Nikita Ioffe <ioffe@google.com> Tue Apr 14 10:02:01 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 14 10:02:01 2020 +0000
tree 4bcca9f6324501443f914ed1d1eba073ae24edd1
parent 67bbb715501c313d9689463acc328c4cbe54019e
parent 90ad5fc78d9ef36ff7c8051cd75707da49a6c267

Merge "Add init.userspace_reboot.started.timeoutmillis property" into rvc-dev

private/property_contexts

diff --git a/private/property_contexts b/private/property_contexts
index 051dd8c..10f029f 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -253,5 +253,6 @@
 init.userspace_reboot.is_supported u:object_r:userspace_reboot_config_prop:s0 exact bool
 init.userspace_reboot.sigkill.timeoutmillis u:object_r:userspace_reboot_config_prop:s0 exact int
 init.userspace_reboot.sigterm.timeoutmillis u:object_r:userspace_reboot_config_prop:s0 exact int
+init.userspace_reboot.started.timeoutmillis u:object_r:userspace_reboot_config_prop:s0 exact int
 init.userspace_reboot.userdata_remount.timeoutmillis u:object_r:userspace_reboot_config_prop:s0 exact int
 init.userspace_reboot.watchdog.timeoutmillis u:object_r:userspace_reboot_config_prop:s0 exact int