Merge "vold: allow FS_IOC_FIEMAP" am: b7d36521 am: 8551db90

am: 24a7302d

Change-Id: Ic751334f23b732d5e260bf060132d6da7096831e

public/vold.te

@@ -53,6 +53,12 @@ allowxperm vold data_file_type:dir ioctl {
   FS_IOC_SET_ENCRYPTION_POLICY
 };
 
+# Find the location on the raw block device where the
+# crypto key is stored so it can be destroyed
+allowxperm vold vold_data_file:file ioctl {
+  FS_IOC_FIEMAP
+};
+
 typeattribute vold mlstrustedsubject;
 allow vold self:process setfscreate;
 allow vold system_file:file x_file_perms;