commit a914cc764e255b639f2463976c98e92316ee27ea
author Nandana Dutt <nandana@google.com> Thu Aug 29 15:22:42 2019 +0100
committer Nandana Dutt <nandana@google.com> Thu Aug 29 15:25:13 2019 +0100
tree dbd7c0d39a759166908b3b2a3754b74f5d96eace
parent 336368067860005cf0d508a7e22ae6293ca0e95b

Use unique_fd

Also allow the state just before doMount() as a valid state for setting
fuse fd.
Test: manual
BUG:140173712

Change-Id: I012f8a83fef00e68f33010954fbc2ebc53cf8f1d

VoldNativeService.cpp

diff --git a/VoldNativeService.cpp b/VoldNativeService.cpp
index 9004b40..9b223c7 100644
--- a/VoldNativeService.cpp
+++ b/VoldNativeService.cpp
@@ -345,7 +345,7 @@
         return translate(res);
     }
 
-    _aidl_return->reset(vol->getDeviceFd());
+    _aidl_return->reset(dup(vol->getFuseFd().get()));
     if (_aidl_return->get() == -1) {
         // Let's not return invalid fd since binder will not allow null fds. Instead give it a
         // default value.