Merge "mFusePid should be cleared after waitpid successfully"

am: 456483d193

Change-Id: I61bf49cea396ebc8009a54740d7322249025acf0

EmulatedVolume.cpp

@@ -105,7 +105,8 @@ status_t EmulatedVolume::doMount() {
         usleep(50000); // 50ms
     }
     /* sdcardfs will have exited already. FUSE will still be running */
-    TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, WNOHANG));
+    if (TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, WNOHANG)) == mFusePid)
+        mFusePid = 0;
 
     return OK;
 }

PublicVolume.cpp

@@ -191,7 +191,8 @@ status_t PublicVolume::doMount() {
         usleep(50000); // 50ms
     }
     /* sdcardfs will have exited already. FUSE will still be running */
-    TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, WNOHANG));
+    if (TEMP_FAILURE_RETRY(waitpid(mFusePid, nullptr, WNOHANG)) == mFusePid)
+        mFusePid = 0;
 
     return OK;
 }