commit ac46172c79bae9fe52f15fc0f0867c2e904cb10e
author Jeff Sharkey <jsharkey@google.com> Tue Oct 24 18:19:08 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 24 18:19:08 2017 +0000
tree ee841e6ef2cd6a3e71a90996b9eaf82c8b3b65f0
parent 236bae4eccecd08f48e976535e48db44bc01dc9e
parent d16dc5089b5fdea77577090b6615541f3ff4915b

Merge "Move vold to Android.bp."

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 1847ab1..befb54d 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -34,9 +34,11 @@
 #include <linux/kdev_t.h>
 
 #include <android-base/logging.h>
+#include <android-base/parseint.h>
 #include <android-base/properties.h>
-#include <android-base/strings.h>
 #include <android-base/stringprintf.h>
+#include <android-base/strings.h>
+
 #include <cutils/fs.h>
 #include <utils/Trace.h>
 
@@ -418,6 +420,10 @@
 
     // Poke through all running PIDs look for apps running as UID
     while ((de = readdir(dir))) {
+        pid_t pid;
+        if (de->d_type != DT_DIR) continue;
+        if (!android::base::ParseInt(de->d_name, &pid)) continue;
+
         pidFd = -1;
         nsFd = -1;