Reland: "Add userspace_reboot_config_prop property type"

am: 7b53803b53

Change-Id: I81a1171a9eb12fb945aeb1e067bfd300d64337b8
This commit is contained in:
Nikita Ioffe 2019-12-26 08:02:05 -08:00 committed by android-build-merger
commit 3ede7f3af7
3 changed files with 12 additions and 1 deletions

View file

@ -56,6 +56,7 @@
timezonedetector_service timezonedetector_service
usb_serial_device usb_serial_device
userspace_reboot_prop userspace_reboot_prop
userspace_reboot_config_prop
userspace_reboot_exported_prop userspace_reboot_exported_prop
vehicle_hal_prop vehicle_hal_prop
vendor_apex_file vendor_apex_file

View file

@ -17,6 +17,9 @@ system_internal_prop(init_svc_debug_prop)
system_internal_prop(last_boot_reason_prop) system_internal_prop(last_boot_reason_prop)
system_internal_prop(netd_stable_secret_prop) system_internal_prop(netd_stable_secret_prop)
system_internal_prop(pm_prop) system_internal_prop(pm_prop)
# Read-write properties internal to userspace reboot properties, e.g.:
# sys.init.userspace_reboot.last_started
# sys.init.userspace_reboot.last_finished
system_internal_prop(userspace_reboot_prop) system_internal_prop(userspace_reboot_prop)
compatible_property_only(` compatible_property_only(`
@ -65,6 +68,13 @@ system_restricted_prop(nnapi_ext_deny_product_prop)
system_restricted_prop(restorecon_prop) system_restricted_prop(restorecon_prop)
system_restricted_prop(system_boot_reason_prop) system_restricted_prop(system_boot_reason_prop)
system_restricted_prop(system_jvmti_agent_prop) system_restricted_prop(system_jvmti_agent_prop)
# Read-only properties that configure behaviour of userspace reboot, e.g:
# ro.init.userspace_reboot.is_supported
# ro.init.userspace_reboot.watchdog_timeout
system_restricted_prop(userspace_reboot_config_prop)
# Read-write properties that can be accessed by other native processes to check
# if userspace reboot is happening, e.g.:
# sys.init.userspace_reboot.in_progress
system_restricted_prop(userspace_reboot_exported_prop) system_restricted_prop(userspace_reboot_exported_prop)
compatible_property_only(` compatible_property_only(`

View file

@ -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.direct.interface u:object_r:exported_default_prop:s0 exact string
wifi.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.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 # public-readable
ro.boot.revision u:object_r:exported2_default_prop:s0 exact string ro.boot.revision u:object_r:exported2_default_prop:s0 exact string