Merge "Revert "Move boot_control_hal attribute to hal_boot domain""

public/hal_boot.te

 # boot_control subsystem
-type hal_boot, domain, boot_control_hal;
+type hal_boot, domain;
 type hal_boot_exec, exec_type, file_type;
 
 # hwbinder access

public/update_engine.te

 # Domain for update_engine daemon.
-type update_engine, domain, domain_deprecated, update_engine_common;
+# update_engine uses the boot_control_hal.
+type update_engine, domain, domain_deprecated, update_engine_common, boot_control_hal;
 type update_engine_exec, exec_type, file_type;
 type update_engine_data_file, file_type, data_file_type;
 
@@ -32,7 +33,3 @@ binder_call(update_engine, priv_app)
 # Read OTA zip file at /data/ota_package/.
 allow update_engine ota_package_file:file r_file_perms;
 allow update_engine ota_package_file:dir r_dir_perms;
-
-# Use binderized boot HAL.
-hwbinder_use(update_engine)
-binder_call(update_engine, hal_boot)

public/update_verifier.te

 # update_verifier
-type update_verifier, domain;
+# update_verifier uses the boot_control_hal.
+type update_verifier, domain, boot_control_hal;
 type update_verifier_exec, exec_type, file_type;
 
 # Allow update_verifier to reach block devices in /dev/block.
@@ -12,7 +13,8 @@ allow update_verifier ota_package_file:file r_file_perms;
 # Read all blocks in system partition.
 allow update_verifier system_block_device:blk_file r_file_perms;
 
-# Use binderized boot HAL.
+# Use binderized HAL
 hwbinder_use(update_verifier)
 binder_call(update_verifier, hal_boot)
 
+allow update_verifier system_file:dir r_dir_perms;