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

Mike Lockwood · Android (Google) Code Review · commit 08fe2687aae9 · 2012-08-07T15:34:49.000-07:00
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java
@@ -325,7 +325,7 @@ public static int getFormatCode(String fileName, String mimeType) {
         }
         int lastDot = fileName.lastIndexOf('.');
         if (lastDot > 0) {
-            String extension = fileName.substring(lastDot + 1);
+            String extension = fileName.substring(lastDot + 1).toUpperCase();
             Integer value = sFileTypeToFormatMap.get(extension);
             if (value != null) {
                 return value.intValue();

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ public static int getFormatCode(String fileName, String mimeType) {`
`325`	`325`	`}`
`326`	`326`	`int lastDot = fileName.lastIndexOf('.');`
`327`	`327`	`if (lastDot > 0) {`
`328`		`- String extension = fileName.substring(lastDot + 1);`
	`328`	`+ String extension = fileName.substring(lastDot + 1).toUpperCase();`
`329`	`329`	`Integer value = sFileTypeToFormatMap.get(extension);`
`330`	`330`	`if (value != null) {`
`331`	`331`	`return value.intValue();`