commit f0fc00703a3ff54c487a8cb92c7e9b48e645396b
author Martijn Coenen <maco@google.com> Fri Apr 24 13:59:25 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 24 13:59:25 2020 +0000
tree 9b46fb575c6e6c9de478952c822d09ad829f9413
parent 9a497640c74db12a5d07fe194e3164c3d5e5713c
parent 083eb69b697fb4a8db4d58125e1225446da1aa50

Merge "Always close FUSE file descriptor when we're exiting the thread." into rvc-dev

jni/FuseDaemon.cpp

diff --git a/jni/FuseDaemon.cpp b/jni/FuseDaemon.cpp
index 63015bd..7f95186 100644
--- a/jni/FuseDaemon.cpp
+++ b/jni/FuseDaemon.cpp
@@ -1554,7 +1554,7 @@
     return active.load(std::memory_order_acquire);
 }
 
-void FuseDaemon::Start(const int fd, const std::string& path) {
+void FuseDaemon::Start(android::base::unique_fd fd, const std::string& path) {
     struct fuse_args args;
     struct fuse_cmdline_opts opts;
 

jni/FuseDaemon.h

diff --git a/jni/FuseDaemon.h b/jni/FuseDaemon.h
index d9925d4..3c4b947 100644
--- a/jni/FuseDaemon.h
+++ b/jni/FuseDaemon.h
@@ -20,6 +20,8 @@
 #include <memory>
 #include <string>
 
+#include <android-base/unique_fd.h>
+
 #include "MediaProviderWrapper.h"
 #include "jni.h"
 
@@ -35,7 +37,7 @@
     /**
      * Start the FUSE daemon loop that will handle filesystem calls.
      */
-    void Start(const int fd, const std::string& path);
+    void Start(android::base::unique_fd fd, const std::string& path);
 
     /**
      * Checks if the FUSE daemon is started.

jni/com_android_providers_media_FuseDaemon.cpp

diff --git a/jni/com_android_providers_media_FuseDaemon.cpp b/jni/com_android_providers_media_FuseDaemon.cpp
index ae1c175..3a65696 100644
--- a/jni/com_android_providers_media_FuseDaemon.cpp
+++ b/jni/com_android_providers_media_FuseDaemon.cpp
@@ -24,6 +24,7 @@
 #include "FuseDaemon.h"
 #include "MediaProviderWrapper.h"
 #include "android-base/logging.h"
+#include "android-base/unique_fd.h"
 
 namespace mediaprovider {
 namespace {
@@ -42,12 +43,14 @@
     LOG(DEBUG) << "Starting the FUSE daemon...";
     fuse::FuseDaemon* const daemon = reinterpret_cast<fuse::FuseDaemon*>(java_daemon);
 
+    android::base::unique_fd ufd(fd);
+
     ScopedUtfChars utf_chars_path(env, java_path);
     if (!utf_chars_path.c_str()) {
         return;
     }
 
-    daemon->Start(fd, utf_chars_path.c_str());
+    daemon->Start(std::move(ufd), utf_chars_path.c_str());
 }
 
 bool com_android_providers_media_FuseDaemon_is_started(JNIEnv* env, jobject self,

src/com/android/providers/media/fuse/FuseDaemon.java

diff --git a/src/com/android/providers/media/fuse/FuseDaemon.java b/src/com/android/providers/media/fuse/FuseDaemon.java
index 95a160b..3b7a0f8 100644
--- a/src/com/android/providers/media/fuse/FuseDaemon.java
+++ b/src/com/android/providers/media/fuse/FuseDaemon.java
@@ -151,7 +151,10 @@
     }
 
     private native long native_new(MediaProvider mediaProvider);
+
+    // Takes ownership of the passed in file descriptor!
     private native void native_start(long daemon, int deviceFd, String path);
+
     private native void native_delete(long daemon);
     private native boolean native_should_open_with_fuse(long daemon, String path, boolean readLock,
             int fd);