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

Commit a061ef6c authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am f9800a01: am 08b30908: Merge "Ensure we compute display name when needed" into jb-dev 

* commit 'f9800a01':
  Ensure we compute display name when needed
parents 409a1a54 f9800a01

media/java/android/media/MediaScanner.java

+7 −0
Original line number Diff line number Diff line
@@ -523,6 +523,13 @@ public class MediaScanner 
            try {

                FileEntry entry = beginFile(path, mimeType, lastModified,

                        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

                if (entry != null && (entry.mLastModifiedChanged || scanAlways)) {

                    if (noMedia) {