Merge "Add userspace_reboot_config_prop property type"

am: 0b099c801d

Change-Id: I30e1f26bef12efec6875d9ee8bdc575822c0420b
This commit is contained in:
Nikita Ioffe 2020-01-09 02:07:05 -08:00 committed by android-build-merger
commit e1811f9499
4 changed files with 4 additions and 1 deletions

View file

@ -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

View file

@ -143,6 +143,7 @@ system_public_prop(powerctl_prop)
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)

View file

@ -400,7 +400,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

View file

@ -257,6 +257,7 @@ set_prop(vendor_init, logd_prop)
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)