Snap for 9931682 from 1603b339e8382f3fdc846892f34bc4405f5176c9 to udc-d1-release
Change-Id: I85ecdd2ceb18edf54c480ac1b68e289c031a94d0
diff --git a/Utils.cpp b/Utils.cpp
index 157b839..bcde4d2 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -1772,15 +1772,18 @@
}
bool IsFuseBpfEnabled() {
- // TODO Once kernel supports flag, trigger off kernel flag unless
- // ro.fuse.bpf.enabled is explicitly set to false
bool enabled;
+ std::string contents;
+
if (base::GetProperty("ro.fuse.bpf.is_running", "") != "")
enabled = base::GetBoolProperty("ro.fuse.bpf.is_running", false);
else if (base::GetProperty("persist.sys.fuse.bpf.override", "") != "")
enabled = base::GetBoolProperty("persist.sys.fuse.bpf.override", false);
- else
+ else if (base::GetProperty("ro.fuse.bpf.enabled", "") != "")
enabled = base::GetBoolProperty("ro.fuse.bpf.enabled", false);
+ else
+ enabled = base::ReadFileToString("/sys/fs/fuse/features/fuse_bpf", &contents) &&
+ contents == "supported\n";
if (enabled) {
base::SetProperty("ro.fuse.bpf.is_running", "true");
diff --git a/vold.rc b/vold.rc
index 9474a1e..bf72b0c 100644
--- a/vold.rc
+++ b/vold.rc
@@ -6,4 +6,5 @@
task_profiles ProcessCapacityHigh
shutdown critical
group root reserved_disk
+ user root
reboot_on_failure reboot,vold-failed
