Merge "Make persist.sys.sf.native_mode an integer" into pi-dev
diff --git a/private/vold_prepare_subdirs.te b/private/vold_prepare_subdirs.te
index ab18258..0a11558 100644
--- a/private/vold_prepare_subdirs.te
+++ b/private/vold_prepare_subdirs.te
@@ -13,9 +13,14 @@
system_data_file
vendor_data_file
}:dir { open read write add_name remove_name rmdir relabelfrom };
-allow vold_prepare_subdirs system_data_file:file { getattr unlink };
-allow vold_prepare_subdirs vold_data_file:dir { create open read write search getattr setattr remove_name rmdir relabelto };
-allow vold_prepare_subdirs vold_data_file:file { getattr unlink };
-allow vold_prepare_subdirs storaged_data_file:dir { create_dir_perms relabelto };
-allow vold_prepare_subdirs storaged_data_file:file getattr;
-allow vold_prepare_subdirs fingerprint_vendor_data_file:dir { create_dir_perms relabelto };
+allow vold_prepare_subdirs {
+ fingerprint_vendor_data_file
+ storaged_data_file
+ vold_data_file
+}:dir { create_dir_perms relabelto };
+allow vold_prepare_subdirs {
+ fingerprint_vendor_data_file
+ storaged_data_file
+ system_data_file
+ vold_data_file
+}:file { getattr unlink };