Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic

Browse Source 
* commit '8b1c74f96f93195326907db1bb07a3787a1c1b45':
  DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
This commit is contained in:
Mike Lockwood
2011-05-04 08:57:56 -07:00
committed by Android Git Automerger
parent df8894486c 8b1c74f96f
commit 0faefb72fb
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/libmedia/MediaScanner.cpp
View File

@@ -135,20 +135,21 @@ status_t MediaScanner::doProcessDirectory(
}
if (type == DT_REG || type == DT_DIR) {
if (type == DT_DIR) {
bool childNoMedia = noMedia;
// set noMedia flag on directories with a name that starts with '.'
// for example, the Mac ".Trashes" directory
if (name[0] == '.')
noMedia = true;
childNoMedia = true;
// report the directory to the client
if (stat(path, &statbuf) == 0) {
client.scanFile(path, statbuf.st_mtime, 0, true, noMedia);
client.scanFile(path, statbuf.st_mtime, 0, true, childNoMedia);
}
// and now process its contents
strcat(fileSpot, "/");
int err = doProcessDirectory(path, pathRemaining - nameLength - 1, client,
noMedia, exceptionCheck, exceptionEnv);
childNoMedia, exceptionCheck, exceptionEnv);
if (err) {
// pass exceptions up - ignore other errors
if (exceptionCheck && exceptionCheck(exceptionEnv)) goto failure;