From 8b570f0c6074115e96355573808b4d0f54319722 Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Mon, 23 Dec 2019 15:10:40 +0000 Subject: [PATCH] Add userspace_reboot_config_prop property type This type will be used for read-only properties used to configure userspace reboot behaviour (e.g. whenever device supports it, watchdog timeout, etc.). Test: adb shell getprop ro.init.userspace_reboot.is_supported Bug: 135984674 Change-Id: I387b2f2f6e3ca96c66c8fa3e6719d013d71f76c7 --- private/compat/29.0/29.0.ignore.cil | 1 + public/property.te | 1 + public/property_contexts | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/private/compat/29.0/29.0.ignore.cil b/private/compat/29.0/29.0.ignore.cil index 03b987ecb..d0613878d 100644 --- a/private/compat/29.0/29.0.ignore.cil +++ b/private/compat/29.0/29.0.ignore.cil @@ -56,6 +56,7 @@ timezonedetector_service usb_serial_device userspace_reboot_prop + userspace_reboot_config_prop userspace_reboot_exported_prop vehicle_hal_prop vendor_apex_file diff --git a/public/property.te b/public/property.te index 50844fbc1..e044d695a 100644 --- a/public/property.te +++ b/public/property.te @@ -18,6 +18,7 @@ system_internal_prop(last_boot_reason_prop) system_internal_prop(netd_stable_secret_prop) system_internal_prop(pm_prop) system_internal_prop(userspace_reboot_prop) +system_internal_prop(userspace_reboot_config_prop) compatible_property_only(` # DO NOT ADD ANY PROPERTIES HERE diff --git a/public/property_contexts b/public/property_contexts index c5b80cfe6..7bcfac5c5 100644 --- a/public/property_contexts +++ b/public/property_contexts @@ -398,7 +398,7 @@ wifi.concurrent.interface u:object_r:exported_default_prop:s0 exact string wifi.direct.interface u:object_r:exported_default_prop:s0 exact string wifi.interface u:object_r:exported_default_prop:s0 exact string ro.apex.updatable u:object_r:exported_default_prop:s0 exact bool -ro.init.userspace_reboot.is_supported u:object_r:userspace_reboot_prop:s0 exact bool +ro.init.userspace_reboot.is_supported u:object_r:userspace_reboot_config_prop:s0 exact bool # public-readable ro.boot.revision u:object_r:exported2_default_prop:s0 exact string