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

Commit 858caeaa authored by Mike Lockwood's avatar Mike Lockwood
Browse files

MediaScanner: Always use mime type provided to the media scanner 



BUG: 3179926

Change-Id: Ib94aea43b83658e3ab31c5eacf7a5135cd14822a
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent b86c89c1

media/java/android/media/MediaScanner.java

+5 −6
Original line number Diff line number Diff line
@@ -434,26 +434,25 @@ 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;

                    if (mMimeType == null) {

                        mMimeType = mediaFileType.mimeType;

                    }

                }

            }



            if (isDrmEnabled() && MediaFile.isDrmFileType(mFileType)) {

                mFileType = getFileTypeFromDrm(path);