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

Author: marcone

media/java/android/media/MediaScanner.java

@@ -523,6 +523,13 @@ public Uri doScanFile(String path, String mimeType, long lastModified,
             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) {