MTP: Use stat.st_mode instead of dirent.d_type to determine file type.
dirent.d_type is not implemented on all file systems.
Change-Id: I50a01fd77a9f976f215e7ff98dd04f0f2611bbce
Signed-off-by: Mike Lockwood <lockwood@android.com>
diff --git a/media/mtp/MtpMediaScanner.cpp b/media/mtp/MtpMediaScanner.cpp
index 4e566f1..1db1b9d 100644
--- a/media/mtp/MtpMediaScanner.cpp
+++ b/media/mtp/MtpMediaScanner.cpp
@@ -294,7 +294,7 @@
memset(&statbuf, 0, sizeof(statbuf));
stat(buffer, &statbuf);
- if (entry->d_type == DT_DIR) {
+ if (S_ISDIR(statbuf.st_mode)) {
MtpObjectHandle handle = mDatabase->getObjectHandle(buffer);
if (handle) {
markFile(handle);
@@ -303,7 +303,7 @@
parent, mStorageID, 0, statbuf.st_mtime);
}
scanDirectory(buffer, handle);
- } else if (entry->d_type == DT_REG) {
+ } else if (S_ISREG(statbuf.st_mode)) {
scanFile(buffer, parent, statbuf);
}
}