Merge "rebootescrow: allow use of block file"

This commit is contained in:
Kenny Root 2020-01-28 17:10:37 +00:00 committed by Gerrit Code Review
commit ebbc1b43cc
5 changed files with 9 additions and 1 deletions

View File

@ -66,6 +66,7 @@
ota_metadata_file ota_metadata_file
ota_prop ota_prop
art_apex_dir art_apex_dir
rebootescrow_hal_prop
service_manager_service service_manager_service
simpleperf simpleperf
soundtrigger_middleware_service soundtrigger_middleware_service

View File

@ -155,6 +155,9 @@ system_public_prop(wifi_prop)
system_public_prop(binder_cache_bluetooth_server_prop) system_public_prop(binder_cache_bluetooth_server_prop)
system_public_prop(binder_cache_system_server_prop) system_public_prop(binder_cache_system_server_prop)
# Properties used in default HAL implementations
vendor_internal_prop(rebootescrow_hal_prop)
# Properties which are public for devices launching with Android O or earlier # Properties which are public for devices launching with Android O or earlier
# This should not be used for any new properties. # This should not be used for any new properties.
not_compatible_property(` not_compatible_property(`

View File

@ -150,6 +150,7 @@ ro.minui.pixel_format u:object_r:exported3_default_prop:s0 exact string
ro.oem_unlock_supported u:object_r:exported3_default_prop:s0 exact int ro.oem_unlock_supported u:object_r:exported3_default_prop:s0 exact int
ro.opengles.version u:object_r:exported3_default_prop:s0 exact int ro.opengles.version u:object_r:exported3_default_prop:s0 exact int
ro.radio.noril u:object_r:exported3_default_prop:s0 exact string ro.radio.noril u:object_r:exported3_default_prop:s0 exact string
ro.rebootescrow.device u:object_r:rebootescrow_hal_prop:s0 exact string
ro.retaildemo.video_path u:object_r:exported3_default_prop:s0 exact string ro.retaildemo.video_path u:object_r:exported3_default_prop:s0 exact string
ro.statsd.enable u:object_r:exported3_default_prop:s0 exact bool ro.statsd.enable u:object_r:exported3_default_prop:s0 exact bool
ro.sf.disable_triple_buffer u:object_r:exported3_default_prop:s0 exact bool ro.sf.disable_triple_buffer u:object_r:exported3_default_prop:s0 exact bool

View File

@ -259,6 +259,7 @@ set_prop(vendor_init, exported3_radio_prop)
set_prop(vendor_init, logd_prop) set_prop(vendor_init, logd_prop)
set_prop(vendor_init, log_tag_prop) set_prop(vendor_init, log_tag_prop)
set_prop(vendor_init, log_prop) set_prop(vendor_init, log_prop)
set_prop(vendor_init, rebootescrow_hal_prop)
set_prop(vendor_init, serialno_prop) set_prop(vendor_init, serialno_prop)
set_prop(vendor_init, userspace_reboot_config_prop) set_prop(vendor_init, userspace_reboot_config_prop)
set_prop(vendor_init, vehicle_hal_prop) set_prop(vendor_init, vehicle_hal_prop)

View File

@ -1,8 +1,10 @@
type hal_rebootescrow_default, domain; type hal_rebootescrow_default, domain;
hal_server_domain(hal_rebootescrow_default, hal_rebootescrow) hal_server_domain(hal_rebootescrow_default, hal_rebootescrow)
get_prop(hal_rebootescrow_default, rebootescrow_hal_prop);
type hal_rebootescrow_default_exec, exec_type, vendor_file_type, file_type; type hal_rebootescrow_default_exec, exec_type, vendor_file_type, file_type;
init_daemon_domain(hal_rebootescrow_default) init_daemon_domain(hal_rebootescrow_default)
type rebootescrow_device, dev_type; type rebootescrow_device, dev_type;
allow hal_rebootescrow_default rebootescrow_device:chr_file rw_file_perms; allow hal_rebootescrow_default rebootescrow_device:{ chr_file blk_file } rw_file_perms;
allow hal_rebootescrow_default block_device:dir search;