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

MediaScanner: Always use mime type provided to the media scanner

Browse Source 
BUG: 3179926

Change-Id: Ib94aea43b83658e3ab31c5eacf7a5135cd14822a
Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
Mike Lockwood
2010-11-16 11:28:42 -05:00
parent b86c89c1a1
commit 858caeaaa1
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -434,24 +434,23 @@ public class MediaScanner
}
}
mMimeType = null;
mMimeType = mimeType;
mFileType = 0;
mFileSize = fileSize;
// try mimeType first, if it is specified
if (mimeType != null) {
mFileType = MediaFile.getFileTypeForMimeType(mimeType);
if (mFileType != 0) {
mMimeType = mimeType;
}
}
// if mimeType was not specified, compute file type based on file extension.
if (mMimeType == null) {
if (mFileType == 0) {
MediaFile.MediaFileType mediaFileType = MediaFile.getFileType(path);
if (mediaFileType != null) {
mFileType = mediaFileType.fileType;
mMimeType = mediaFileType.mimeType;
if (mMimeType == null) {
mMimeType = mediaFileType.mimeType;
}
}
}