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

Merge "Ensure we compute display name when needed" into jb-dev

Browse Source
This commit is contained in:
Marco Nelissen
2012-06-06 15:44:20 -07:00
committed by Android (Google) Code Review
parent a9144ffd64 81e85bbf67
commit 08b3090848
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -523,6 +523,13 @@ public class MediaScanner
try { try {
FileEntry entry = beginFile(path, mimeType, lastModified, FileEntry entry = beginFile(path, mimeType, lastModified,
fileSize, isDirectory, noMedia); fileSize, isDirectory, noMedia);
// if this file was just inserted via mtp, set the rowid to zero
// (even though it already exists in the database), to trigger
// the correct code path for updating its entry
if (mMtpObjectHandle != 0) {
entry.mRowId = 0;
}
// rescan for metadata if file was modified since last scan // rescan for metadata if file was modified since last scan
if (entry != null && (entry.mLastModifiedChanged || scanAlways)) { if (entry != null && (entry.mLastModifiedChanged || scanAlways)) {
if (noMedia) { if (noMedia) {