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

Merge "MediaScanner: Fix problem with duplicate directory entries in the database"

Browse Source
This commit is contained in:
Mike Lockwood
2011-07-26 10:10:28 -07:00
committed by Android (Google) Code Review
parent af20eacc21 c6eaa713a3
commit 833bfd2ba5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -872,10 +872,14 @@ public class MediaScanner
values.put(Files.FileColumns.FORMAT, format);
}
// new file, insert it
if (inserter != null) {
result = inserter.insert(values);
} else {
// We insert directories immediately to ensure they are in the database
// before the files they contain.
// Otherwise we can get duplicate directory entries in the database
// if one of the media FileInserters is flushed before the files table FileInserter
if (inserter == null || entry.mFormat == MtpConstants.FORMAT_ASSOCIATION) {
result = mMediaProvider.insert(tableUri, values);
} else {
result = inserter.insert(values);
}
if (result != null) {