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

Commit c8bcceb2 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 08fe2687: Merge "MediaFile: Fix case sensitive file extension matching for... 

am 08fe2687: Merge "MediaFile: Fix case sensitive file extension matching for computing MTP format code" into jb-mr1-dev

* commit '08fe2687':
  MediaFile: Fix case sensitive file extension matching for computing MTP format code
parents 5783b5de 08fe2687

media/java/android/media/MediaFile.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -325,7 +325,7 @@ public class MediaFile { 
        }

        }

        int lastDot = fileName.lastIndexOf('.');

        int lastDot = fileName.lastIndexOf('.');

        if (lastDot > 0) {

        if (lastDot > 0) {

            String extension = fileName.substring(lastDot + 1);

            String extension = fileName.substring(lastDot + 1).toUpperCase();

            Integer value = sFileTypeToFormatMap.get(extension);

            Integer value = sFileTypeToFormatMap.get(extension);

            if (value != null) {

            if (value != null) {

                return value.intValue();

                return value.intValue();