Merge cherrypicks of [15617994, 15618969, 15618970, 15617995, 1561803…

…2, 15618033, 15618190, 15620097, 15618565, 15620098, 15617967, 15619902, 15620257, 15619392] into sc-release Change-Id: I93eb084990631cfbc74aab8c513af84c3de0ef9d
AOSP-12 · Aug 19, 2021 · 5e88614 · 5e88614
2 parents 4fc2a76 + 0fc214e
commit 5e88614
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/prebuilts/api/31.0/public/shell.te b/prebuilts/api/31.0/public/shell.te
@@ -158,6 +158,9 @@ allow shell sysfs:dir r_dir_perms;
 allow shell sysfs_batteryinfo:dir r_dir_perms;
 allow shell sysfs_batteryinfo:file r_file_perms;
 
+# allow shell to list /sys/class/block/ to get storage type for CTS
+allow shell sysfs_block:dir r_dir_perms;
+
 # Allow access to ion memory allocation device.
 allow shell ion_device:chr_file rw_file_perms;
 

diff --git a/public/shell.te b/public/shell.te
@@ -158,6 +158,9 @@ allow shell sysfs:dir r_dir_perms;
 allow shell sysfs_batteryinfo:dir r_dir_perms;
 allow shell sysfs_batteryinfo:file r_file_perms;
 
+# allow shell to list /sys/class/block/ to get storage type for CTS
+allow shell sysfs_block:dir r_dir_perms;
+
 # Allow access to ion memory allocation device.
 allow shell ion_device:chr_file rw_file_perms;