Snap for 6755001 from 112a122 to rvc-qpr1-release

android-build-team Robot · android-build-team Robot · commit d7bcf17c22fb · 2020-08-11T23:09:53.000Z
Change-Id: Ic843d6d636513bb0d54e43f3576242710091daac
diff --git a/prebuilts/api/30.0/private/apexd.te b/prebuilts/api/30.0/private/apexd.te
@@ -37,6 +37,7 @@ allowxperm apexd loop_device:blk_file ioctl {
   LOOP_SET_DIRECT_IO
   LOOP_CLR_FD
   BLKFLSBUF
+  LOOP_CONFIGURE
 };
 # allow apexd to access /dev/block
 allow apexd block_device:dir r_dir_perms;
diff --git a/prebuilts/api/30.0/public/ioctl_defines b/prebuilts/api/30.0/public/ioctl_defines
@@ -1370,6 +1370,7 @@ define(`LOGGER_GET_VERSION', `0x0000ae05')
 define(`LOGGER_SET_VERSION', `0x0000ae06')
 define(`LOOP_CHANGE_FD', `0x00004c06')
 define(`LOOP_CLR_FD', `0x00004c01')
+define(`LOOP_CONFIGURE', `0x00004c0a')
 define(`LOOP_CTL_ADD', `0x00004c80')
 define(`LOOP_CTL_GET_FREE', `0x00004c82')
 define(`LOOP_CTL_REMOVE', `0x00004c81')
diff --git a/private/apexd.te b/private/apexd.te
@@ -37,6 +37,7 @@ allowxperm apexd loop_device:blk_file ioctl {
   LOOP_SET_DIRECT_IO
   LOOP_CLR_FD
   BLKFLSBUF
+  LOOP_CONFIGURE
 };
 # allow apexd to access /dev/block
 allow apexd block_device:dir r_dir_perms;
diff --git a/public/ioctl_defines b/public/ioctl_defines
@@ -1370,6 +1370,7 @@ define(`LOGGER_GET_VERSION', `0x0000ae05')
 define(`LOGGER_SET_VERSION', `0x0000ae06')
 define(`LOOP_CHANGE_FD', `0x00004c06')
 define(`LOOP_CLR_FD', `0x00004c01')
+define(`LOOP_CONFIGURE', `0x00004c0a')
 define(`LOOP_CTL_ADD', `0x00004c80')
 define(`LOOP_CTL_GET_FREE', `0x00004c82')
 define(`LOOP_CTL_REMOVE', `0x00004c81')
