commit df8e2672f0a03d0b6ce53d2ab8b15d4b2c5e2fd4
author Nikita Ioffe <ioffe@google.com> Wed Mar 25 20:02:05 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 25 20:02:05 2020 +0000
tree 1784110b8f7c16d1da7f7ff8b3c2a6593e8c1407
parent c63e10d83ce1effcfe879d0b6b2b3db0a3f7b753
parent 9e6588dc95d9a9efd11a9d423e4551671eb8e65e

Merge "Use properties for various userspace reboot timeouts"

private/property_contexts

diff --git a/private/property_contexts b/private/property_contexts
index c8e743c..5baaf9d 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -760,8 +760,14 @@
 
 ro.apex.updatable u:object_r:exported_default_prop:s0 exact bool
 
-ro.init.userspace_reboot.is_supported u:object_r:userspace_reboot_config_prop:s0 exact bool
+# Properties to configure userspace reboot.
+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.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
 
+#
 # public-readable
 ro.boot.revision u:object_r:exported2_default_prop:s0 exact string