Stop using the bdev_type and sysfs_block_type SELinux attributes

Stop using these attributes since these will be removed soon.

Bug: 202520796
Test: source build/envsetup.sh && lunch aosp_x86_64 && m && launch_cvd
Change-Id: I61dffb482f4e952299156f34be642ae52fcbfeb3
Signed-off-by: Bart Van Assche <bvanassche@google.com>

private/apexd.te

@@ -44,8 +44,8 @@ allowxperm apexd loop_device:blk_file ioctl {
   LOOP_CONFIGURE
 };
 # Allow apexd to access /dev/block
-allow apexd bdev_type:dir r_dir_perms;
-allow apexd bdev_type:blk_file getattr;
+allow apexd dev_type:dir r_dir_perms;
+allow apexd dev_type:blk_file getattr;
 
 #allow apexd to access virtual disks
 allow apexd vd_device:blk_file r_file_perms;
@@ -99,8 +99,9 @@ allow apexd labeledfs:filesystem { mount unmount };
 
 # /sys directory tree traversal
 allow apexd sysfs_type:dir search;
-allow apexd sysfs_block_type:dir r_dir_perms;
-allow apexd sysfs_block_type:file r_file_perms;
+# Access to /sys/class/block
+allow apexd sysfs_type:dir r_dir_perms;
+allow apexd sysfs_type:file r_file_perms;
 # Configure read-ahead of dm-verity and loop devices
 # for dm-X
 allow apexd sysfs_dm:dir r_dir_perms;

private/coredomain.te

@@ -37,6 +37,7 @@ neverallow {
     -init
 
     # generic access to sysfs_type
+    -apexd
     -ueventd
     -vold
 } sysfs_leds:file *;
@@ -137,6 +138,7 @@ full_treble_only(`
   # /sys
   neverallow {
     coredomain
+    -apexd
     -init
     -ueventd
     -vold
@@ -145,6 +147,7 @@ full_treble_only(`
   # /dev
   neverallow {
     coredomain
+    -apexd
     -fsck
     -init
     -ueventd

public/domain.te

@@ -1357,6 +1357,8 @@ full_treble_only(`
     coredomain
     -healthd
     -shell
+    # For access to block device information under /sys/class/block.
+    -apexd
     # Generate uevents for health info
     -ueventd
     # Recovery uses health HAL passthrough implementation.