commit 1edb6550abe80993c96d86d4130f9bbe71de1b98
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 13 15:22:48 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 13 15:22:48 2022 +0000
tree 7cd216279ee6701250475ac3da1a53e71a815d23
parent 3937b479bd57885fb8caf00c7c6bae207d0e6951
parent 8c250754a9fc6864490b26ea710520434a647469

Merge "Add ro.fuse.bpf.is_running"

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 23e8867..5db77d9 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -1772,13 +1772,15 @@
 }
 
 bool IsFuseBpfEnabled() {
-    std::string bpf_override = android::base::GetProperty("persist.sys.fuse.bpf.override", "");
-    if (bpf_override == "true") {
+    // TODO Once kernel supports flag, trigger off kernel flag unless
+    //      ro.fuse.bpf.enabled is explicitly set to false
+    if (base::GetBoolProperty("ro.fuse.bpf.enabled", false)) {
+        base::SetProperty("ro.fuse.bpf.is_running", "true");
         return true;
-    } else if (bpf_override == "false") {
+    } else {
+        base::SetProperty("ro.fuse.bpf.is_running", "false");
         return false;
     }
-    return base::GetBoolProperty("ro.fuse.bpf.enabled", false);
 }
 
 }  // namespace vold