Merge cherrypicks of [15619363, 15619364, 15619365, 15619399, 15619400, 15619401, 15619366, 15619367, 15619368, 15619369, 15619424, 15619425, 15619426, 15619427, 15619428, 15619402, 15619403, 15619404, 15619370, 15619371, 15619372, 15619373, 15618427, 15619429, 15619405, 15619406, 15619407, 15619408, 15619374, 15619375, 15619409] into sc-d1-release
Change-Id: I5339b7fe702dd4fd20d5bb4b5a1e7d4aab974b78
diff --git a/whitechapel/vendor/google/device.te b/whitechapel/vendor/google/device.te
index bd62647..bc3c947 100644
--- a/whitechapel/vendor/google/device.te
+++ b/whitechapel/vendor/google/device.te
@@ -1,12 +1,12 @@
# Block Devices
-type efs_block_device, dev_type;
-type fat_block_device, dev_type;
-type modem_block_device, dev_type;
-type modem_userdata_block_device, dev_type;
-type persist_block_device, dev_type;
-type vendor_block_device, dev_type;
-type sda_block_device, dev_type;
-type mfg_data_block_device, dev_type;
+type efs_block_device, dev_type, bdev_type;
+type fat_block_device, dev_type, bdev_type;
+type modem_block_device, dev_type, bdev_type;
+type modem_userdata_block_device, dev_type, bdev_type;
+type persist_block_device, dev_type, bdev_type;
+type vendor_block_device, dev_type, bdev_type;
+type sda_block_device, dev_type, bdev_type;
+type mfg_data_block_device, dev_type, bdev_type;
# Exynos devices
type vendor_m2m1shot_device, dev_type;
@@ -14,8 +14,8 @@
type vendor_nanohub_device, dev_type;
type vendor_secmem_device, dev_type;
type vendor_toe_device, dev_type;
-type custom_ab_block_device, dev_type;
-type devinfo_block_device, dev_type;
+type custom_ab_block_device, dev_type, bdev_type;
+type devinfo_block_device, dev_type, bdev_type;
# usbpd
type logbuffer_device, dev_type;
diff --git a/whitechapel/vendor/google/file.te b/whitechapel/vendor/google/file.te
index 85c8dcc..b8c22e1 100644
--- a/whitechapel/vendor/google/file.te
+++ b/whitechapel/vendor/google/file.te
@@ -78,7 +78,7 @@
type mediadrm_vendor_data_file, file_type, data_file_type;
# Storage Health HAL
-type sysfs_scsi_devices_0000, sysfs_type, fs_type;
+type sysfs_scsi_devices_0000, sysfs_type, fs_type, sysfs_block_type;
type debugfs_f2fs, debugfs_type, fs_type;
type proc_f2fs, proc_type, fs_type;
