Revert "Revert "Remove the bdev_type and sysfs_block_type SELinux attributes""
This reverts commit 45bc87f69bf766e1e0e100346ec4107f00b94b9d.
Reason for revert: Restore this patch since it was not necessary to revert this patch.
Bug: 202520796
Change-Id: Iba682eaac53d522da06fa3f3f9e86dd384e36f42
diff --git a/vendor/google/device.te b/vendor/google/device.te
index 21282a1..3a88966 100644
--- a/vendor/google/device.te
+++ b/vendor/google/device.te
@@ -1,6 +1,6 @@
type ramoops_device, dev_type;
type rls_device, dev_type;
-type dp_block_device, dev_type, bdev_type;
+type dp_block_device, dev_type;
type qg_device, dev_type;
type logbuffer_device, dev_type;
type smcinvoke_device, dev_type;
diff --git a/vendor/qcom/common/device.te b/vendor/qcom/common/device.te
index 43a7063..db7a09c 100644
--- a/vendor/qcom/common/device.te
+++ b/vendor/qcom/common/device.te
@@ -3,15 +3,15 @@
type qdsp_device, dev_type, mlstrustedobject;
type fm_radio_device, dev_type;
type sg_device, dev_type;
-type ssd_block_device, dev_type, bdev_type;
+type ssd_block_device, dev_type;
type ramdump_device, dev_type;
type ipa_dev, dev_type;
type modem_ssr_device, dev_type;
type qce_device, dev_type;
type at_device, dev_type;
type wlan_device, dev_type;
-type custom_ab_block_device, dev_type, bdev_type;
-type xbl_block_device, dev_type, bdev_type;
-type gpt_block_device, dev_type, bdev_type;
-type modem_block_device, dev_type, bdev_type;
-type persist_block_device, dev_type, bdev_type;
+type custom_ab_block_device, dev_type;
+type xbl_block_device, dev_type;
+type gpt_block_device, dev_type;
+type modem_block_device, dev_type;
+type persist_block_device, dev_type;
diff --git a/vendor/qcom/common/file.te b/vendor/qcom/common/file.te
index 1cfad85..1573c2d 100644
--- a/vendor/qcom/common/file.te
+++ b/vendor/qcom/common/file.te
@@ -51,7 +51,7 @@
type mpss_rfs_data_file, data_file_type, file_type;
type rfs_tombstone_data_file, data_file_type, file_type;
type sysfs_msm_wlan, sysfs_type, fs_type;
-type sysfs_scsi_devices_0000, sysfs_type, fs_type, sysfs_block_type;
+type sysfs_scsi_devices_0000, sysfs_type, fs_type;
type debugfs_sched_features, debugfs_type, fs_type;
type debugfs_wlan, debugfs_type, fs_type;
type debugfs_ipc, debugfs_type, fs_type;
