commit 1d79d1014e481c92c3f802bbaf174409d191571f
author Daniel Rosenberg <drosen@google.com> Tue Jul 11 17:59:55 2017 -0700
committer Daniel Rosenberg <drosen@google.com> Tue Jul 11 18:09:15 2017 -0700
tree 8167afc43ecd1682f40239c6dd5254b1aa2798ff
parent 5139cdf9279015ef4c6e6a9452ae4a44f14bcba2

Check if sdcard daemon exited.

If the system is using sdcardfs, the sdcard daemon exits after mounting.
If it's using FUSE, the sdcard daemon runs until we go to unmount.

Bug: 37638548
Test: Run "adb shell ps | grep -w Z" with sdcardfs enabled.
      The sdcard daemon should not be listed.
      Run again with sdcardfs disabled. The daemon should be
      running, and vold should not be stuck waiting on it.
Change-Id: I930d22b35194ec99e7a6a4a022a04d36f4f39a34

PublicVolume.cpp

diff --git a/PublicVolume.cpp b/PublicVolume.cpp
index 119d92c..f976c4a 100644
--- a/PublicVolume.cpp
+++ b/PublicVolume.cpp
@@ -190,6 +190,8 @@
         LOG(VERBOSE) << "Waiting for FUSE to spin up...";
         usleep(50000); // 50ms
     }
+    /* sdcardfs will have exited already. FUSE will still be running */
+    TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, WNOHANG));
 
     return OK;
 }