Merge "Add compile time check for expanded attribute neverallow failure"
diff --git a/private/system_server.te b/private/system_server.te
index b88721e..edb6c7b 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -540,6 +540,12 @@
# FingerprintService.java does a restorecon of the directory /data/system/users/[0-9]+/fpdata(/.*)?
allow system_server system_data_file:dir relabelfrom;
+# server_configurable_flags_data_file is used for storing server configurable flags which
+# have been reset during current booting. system_server needs to read the data to perform related
+# disaster recovery actions.
+allow system_server server_configurable_flags_data_file:dir r_dir_perms;
+allow system_server server_configurable_flags_data_file:file r_file_perms;
+
# Property Service write
set_prop(system_server, system_prop)
set_prop(system_server, exported_system_prop)
diff --git a/public/vold.te b/public/vold.te
index d6ab4af..6994776 100644
--- a/public/vold.te
+++ b/public/vold.te
@@ -125,7 +125,7 @@
#
# Unmount and mount the fs.
-allow vold labeledfs:filesystem { mount unmount };
+allow vold labeledfs:filesystem { mount unmount remount };
# Access /efs/userdata_footer.
# XXX Split into a separate type?