Revert "Remove the bdev_type and sysfs_block_type SELinux attributes"
This reverts commit 63930d3850b1592c3a0a84734777232e81228412.
Reason for revert: Broken build (https://android-build.googleplex.com/builds/submitted/7863094/aosp_raven-userdebug/latest/view/logs/error.log)
Change-Id: I1742d69d471e9b00359a2e7e654aa752513990df
diff --git a/private/compat/31.0/31.0.cil b/private/compat/31.0/31.0.cil
index fd92b18..35059a9 100644
--- a/private/compat/31.0/31.0.cil
+++ b/private/compat/31.0/31.0.cil
@@ -91,7 +91,6 @@
(expandtypeattribute (battery_service_31_0) true)
(expandtypeattribute (batteryproperties_service_31_0) true)
(expandtypeattribute (batterystats_service_31_0) true)
-(expandtypeattribute (bdev_type_31_0) true)
(expandtypeattribute (binder_cache_bluetooth_server_prop_31_0) true)
(expandtypeattribute (binder_cache_system_server_prop_31_0) true)
(expandtypeattribute (binder_cache_telephony_server_prop_31_0) true)
@@ -953,7 +952,6 @@
(expandtypeattribute (sysfs_31_0) true)
(expandtypeattribute (sysfs_android_usb_31_0) true)
(expandtypeattribute (sysfs_batteryinfo_31_0) true)
-(expandtypeattribute (sysfs_block_type_31_0) true)
(expandtypeattribute (sysfs_bluetooth_writable_31_0) true)
(expandtypeattribute (sysfs_devfreq_cur_31_0) true)
(expandtypeattribute (sysfs_devfreq_dir_31_0) true)
@@ -1323,7 +1321,6 @@
(typeattributeset battery_service_31_0 (battery_service))
(typeattributeset batteryproperties_service_31_0 (batteryproperties_service))
(typeattributeset batterystats_service_31_0 (batterystats_service))
-(typeattributeset bdev_type_31_0 (bdev_type))
(typeattributeset binder_cache_bluetooth_server_prop_31_0 (binder_cache_bluetooth_server_prop))
(typeattributeset binder_cache_system_server_prop_31_0 (binder_cache_system_server_prop))
(typeattributeset binder_cache_telephony_server_prop_31_0 (binder_cache_telephony_server_prop))
@@ -2185,7 +2182,6 @@
(typeattributeset sysfs_31_0 (sysfs))
(typeattributeset sysfs_android_usb_31_0 (sysfs_android_usb))
(typeattributeset sysfs_batteryinfo_31_0 (sysfs_batteryinfo))
-(typeattributeset sysfs_block_type_31_0 (sysfs_block_type))
(typeattributeset sysfs_bluetooth_writable_31_0 (sysfs_bluetooth_writable))
(typeattributeset sysfs_devfreq_cur_31_0 (sysfs_devfreq_cur))
(typeattributeset sysfs_devfreq_dir_31_0 (sysfs_devfreq_dir))
diff --git a/private/genfs_contexts b/private/genfs_contexts
index 8f82b5d..664a3b3 100644
--- a/private/genfs_contexts
+++ b/private/genfs_contexts
@@ -119,6 +119,7 @@
genfscon sysfs /devices/system/cpu u:object_r:sysfs_devices_system_cpu:s0
genfscon sysfs /class/android_usb u:object_r:sysfs_android_usb:s0
genfscon sysfs /class/extcon u:object_r:sysfs_extcon:s0
+genfscon sysfs /class/block u:object_r:sysfs_block:s0
genfscon sysfs /class/leds u:object_r:sysfs_leds:s0
genfscon sysfs /class/net u:object_r:sysfs_net:s0
genfscon sysfs /class/rfkill/rfkill0/state u:object_r:sysfs_bluetooth_writable:s0