Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15d3e0a9 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "MTP: Use stat.st_mode instead of dirent.d_type to determine file type."

parents 8071de90 9eb5ac9c

media/mtp/MtpMediaScanner.cpp

+2 −2
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ int MtpMediaScanner::scanDirectory(const char* path, MtpObjectHandle parent) 
        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 @@ int MtpMediaScanner::scanDirectory(const char* path, MtpObjectHandle parent) 
                        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);

        }

    }