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

am a8a656b0: Fix scanning of modified files.

Browse Source 
* commit 'a8a656b0c595fa876a387a91f8813f88a2d3abe7':
  Fix scanning of modified files.
This commit is contained in:
Marco Nelissen
2011-01-12 15:03:28 -08:00
committed by Android Git Automerger
parent c31e095e2b a8a656b0c5
commit 18aa2da202
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
media/java/android/media/MediaScanner.java
View File

@@ -463,7 +463,10 @@ public class MediaScanner
key = path.toLowerCase();
}
FileCacheEntry entry = mFileCache.get(key);
if (entry == null) {
// add some slack to avoid a rounding error
long delta = (entry != null) ? (lastModified - entry.mLastModified) : 0;
boolean wasModified = delta > 1 || delta < -1;
if (entry == null || wasModified) {
Uri tableUri;
if (isDirectory) {
tableUri = mFilesUri;
@@ -476,18 +479,17 @@ public class MediaScanner
} else {
tableUri = mFilesUri;
}
entry = new FileCacheEntry(tableUri, 0, path, 0,
(isDirectory ? MtpConstants.FORMAT_ASSOCIATION : 0));
mFileCache.put(key, entry);
}
entry.mSeenInFileSystem = true;
// add some slack to avoid a rounding error
long delta = lastModified - entry.mLastModified;
if (delta > 1 || delta < -1) {
entry.mLastModified = lastModified;
if (wasModified) {
entry.mLastModified = lastModified;
entry.mTableUri = tableUri;
} else {
entry = new FileCacheEntry(tableUri, 0, path, lastModified,
(isDirectory ? MtpConstants.FORMAT_ASSOCIATION : 0));
mFileCache.put(key, entry);
}
entry.mLastModifiedChanged = true;
}
entry.mSeenInFileSystem = true;
if (mProcessPlaylists && MediaFile.isPlayListFileType(mFileType)) {
mPlayLists.add(entry);