Merge "Add userspace_reboot_config_prop property type"
diff --git a/private/compat/29.0/29.0.ignore.cil b/private/compat/29.0/29.0.ignore.cil
index 61bc680..e3eda7e 100644
--- a/private/compat/29.0/29.0.ignore.cil
+++ b/private/compat/29.0/29.0.ignore.cil
@@ -63,6 +63,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 f2bf870..07581d3 100644
--- a/public/property.te
+++ b/public/property.te
@@ -143,6 +143,7 @@
system_public_prop(radio_prop)
system_public_prop(serialno_prop)
system_public_prop(system_prop)
+system_public_prop(userspace_reboot_config_prop)
system_public_prop(vehicle_hal_prop)
system_public_prop(vendor_security_patch_level_prop)
system_public_prop(wifi_log_prop)
diff --git a/public/property_contexts b/public/property_contexts
index 22288db..bb270fe 100644
--- a/public/property_contexts
+++ b/public/property_contexts
@@ -400,7 +400,7 @@
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
diff --git a/public/vendor_init.te b/public/vendor_init.te
index 4af41ee..6196266 100644
--- a/public/vendor_init.te
+++ b/public/vendor_init.te
@@ -257,6 +257,7 @@
set_prop(vendor_init, log_tag_prop)
set_prop(vendor_init, log_prop)
set_prop(vendor_init, serialno_prop)
+set_prop(vendor_init, userspace_reboot_config_prop)
set_prop(vendor_init, vehicle_hal_prop)
set_prop(vendor_init, vendor_default_prop)
set_prop(vendor_init, vendor_security_patch_level_prop)