rebootescrow: allow use of block file

pmem uses a block file while access_ramoops uses a char file. Allow both for
now until we can unify on pmem.

Additionally allow the reading of vendor properties so it can read the
path to the character or block device to open.

Test: atest VtsHalRebootEscrowTargetTest
Bug: 146400078
Change-Id: Ief61534e0946480a01c635ce1672579959ec8db5
This commit is contained in:
Kenny Root 2020-01-24 16:31:58 -08:00
parent 5f11b2e0ed
commit 960f73b75b
5 changed files with 9 additions and 1 deletions

View file

@ -66,6 +66,7 @@
ota_metadata_file
ota_prop
art_apex_dir
rebootescrow_hal_prop
service_manager_service
simpleperf
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_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
# This should not be used for any new properties.
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.opengles.version u:object_r:exported3_default_prop:s0 exact int
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.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

View file

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

View file

@ -1,8 +1,10 @@
type hal_rebootescrow_default, domain;
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;
init_daemon_domain(hal_rebootescrow_default)
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;