From 21194d2dc3d737c00d115c252ff0efff778c08d7 Mon Sep 17 00:00:00 2001 From: Randall Huang Date: Wed, 4 Sep 2024 00:04:30 +0800 Subject: [PATCH] storage: move storage related device type to common folder Bug: 364225000 Test: forrest build Change-Id: I3fb2a9a46d00ac27931ee8c1ad7b3ceef0920cdb Signed-off-by: Randall Huang --- legacy/zuma/vendor/device.te | 4 ++-- legacy/zuma/vendor/ufs_firmware_update.te | 5 ++--- radio/device.te | 4 ++-- vendor/file_contexts | 1 - 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/legacy/zuma/vendor/device.te b/legacy/zuma/vendor/device.te index 80bf3f0..dce1d92 100644 --- a/legacy/zuma/vendor/device.te +++ b/legacy/zuma/vendor/device.te @@ -1,7 +1,6 @@ -type persist_block_device, dev_type; +# device.te type custom_ab_block_device, dev_type; type mfg_data_block_device, dev_type; -type ufs_internal_block_device, dev_type; type logbuffer_device, dev_type; type fingerprint_device, dev_type; type uci_device, dev_type; @@ -15,3 +14,4 @@ type gcma_camera_heap_device, dmabuf_heap_device_type, dev_type; # SecureElement SPI device type st54spi_device, dev_type; + diff --git a/legacy/zuma/vendor/ufs_firmware_update.te b/legacy/zuma/vendor/ufs_firmware_update.te index 04e532e..8fbb5d1 100644 --- a/legacy/zuma/vendor/ufs_firmware_update.te +++ b/legacy/zuma/vendor/ufs_firmware_update.te @@ -1,6 +1,4 @@ -type ufs_firmware_update, domain; -type ufs_firmware_update_exec, vendor_file_type, exec_type, file_type; - +# ufs ffu userdebug_or_eng(` init_daemon_domain(ufs_firmware_update) @@ -10,3 +8,4 @@ userdebug_or_eng(` allow ufs_firmware_update sysfs:dir r_dir_perms; allow ufs_firmware_update sysfs_scsi_devices_0000:file r_file_perms; ') + diff --git a/radio/device.te b/radio/device.te index 2f1aff7..f2b5dc1 100644 --- a/radio/device.te +++ b/radio/device.te @@ -1,3 +1,3 @@ +# radio type modem_block_device, dev_type; -type modem_userdata_block_device, dev_type; -type efs_block_device, dev_type; + diff --git a/vendor/file_contexts b/vendor/file_contexts index 8af27f9..65fa3b0 100644 --- a/vendor/file_contexts +++ b/vendor/file_contexts @@ -22,7 +22,6 @@ /vendor/bin/chre u:object_r:chre_exec:s0 /vendor/bin/hw/android\.hardware\.security\.keymint-service\.rust\.trusty u:object_r:hal_keymint_default_exec:s0 /vendor/bin/hw/android\.hardware\.security\.secretkeeper\.trusty u:object_r:hal_secretkeeper_default_exec:s0 -/vendor/bin/ufs_firmware_update\.sh u:object_r:ufs_firmware_update_exec:s0 /vendor/bin/hw/qfp-daemon u:object_r:hal_fingerprint_default_exec:s0 /vendor/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.goodix u:object_r:hal_fingerprint_default_exec:s0 /vendor/bin/hw/android\.hardware\.biometrics\.fingerprint-service\.goodix u:object_r:hal_fingerprint_default_exec:s0