storage: move storage related device type to common folder
Bug: 364225000
Test: forrest build
Change-Id: Iaed5b07a1d9823ebf3c7210921784d81bf6207a5
Signed-off-by: Randall Huang <[email protected]>
diff --git a/whitechapel_pro/device.te b/whitechapel_pro/device.te
index 24bb1e8..d23a1ad 100644
--- a/whitechapel_pro/device.te
+++ b/whitechapel_pro/device.te
@@ -1,9 +1,6 @@
# device.te
type modem_block_device, dev_type;
type custom_ab_block_device, dev_type;
-type persist_block_device, dev_type;
-type efs_block_device, dev_type;
-type modem_userdata_block_device, dev_type;
type mfg_data_block_device, dev_type;
type vendor_toe_device, dev_type;
type lwis_device, dev_type;
@@ -22,5 +19,3 @@
type st54spi_device, dev_type;
type st33spi_device, dev_type;
-# Storage firmware upgrade
-type ufs_internal_block_device, dev_type;
diff --git a/whitechapel_pro/file_contexts b/whitechapel_pro/file_contexts
index 293afb3..f704078 100644
--- a/whitechapel_pro/file_contexts
+++ b/whitechapel_pro/file_contexts
@@ -40,7 +40,6 @@
/vendor/bin/hw/android\.hardware\.memtrack-service\.pixel u:object_r:hal_memtrack_default_exec:s0
/system_ext/bin/convert_to_ext4\.sh u:object_r:convert-to-ext4-sh_exec:s0
/vendor/bin/hw/disable_contaminant_detection\.sh u:object_r:disable-contaminant-detection-sh_exec:s0
-/vendor/bin/ufs_firmware_update\.sh u:object_r:ufs_firmware_update_exec:s0
/vendor/bin/init\.check_ap_pd_auth\.sh u:object_r:init-check_ap_pd_auth-sh_exec:s0
# Vendor Firmwares
diff --git a/whitechapel_pro/ufs_firmware_update.te b/whitechapel_pro/ufs_firmware_update.te
index f33c2da..121e462 100644
--- a/whitechapel_pro/ufs_firmware_update.te
+++ b/whitechapel_pro/ufs_firmware_update.te
@@ -1,11 +1,11 @@
-type ufs_firmware_update, domain;
-type ufs_firmware_update_exec, vendor_file_type, exec_type, file_type;
-
+# ufs ffu
init_daemon_domain(ufs_firmware_update)
+# ufs ffu
allow ufs_firmware_update vendor_toolbox_exec:file execute_no_trans;
allow ufs_firmware_update block_device:dir r_dir_perms;
allow ufs_firmware_update fips_block_device:blk_file rw_file_perms;
allow ufs_firmware_update sysfs:dir r_dir_perms;
allow ufs_firmware_update sysfs_scsi_devices_0000:dir search;
allow ufs_firmware_update sysfs_scsi_devices_0000:file r_file_perms;
+
