summaryrefslogtreecommitdiffstats
path: root/packages/ExternalStorageProvider
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-10-25 18:22:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-25 18:22:22 -0700
commit8b5f453a82e4e09933f31630ad7f94e4d81df1cd (patch)
treedaa1063e0184698e310511ee6871fa46056f4d5d /packages/ExternalStorageProvider
parentb251e0794a6e95a7d48122ad8905cb4d662f0ae8 (diff)
parentde9b66fee1bdbc914c287fb9a2aa832dc2d3e6f9 (diff)
downloadframeworks_base-8b5f453a82e4e09933f31630ad7f94e4d81df1cd.zip
frameworks_base-8b5f453a82e4e09933f31630ad7f94e4d81df1cd.tar.gz
frameworks_base-8b5f453a82e4e09933f31630ad7f94e4d81df1cd.tar.bz2
am de9b66fe: am 3ac436b7: am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev
* commit 'de9b66fee1bdbc914c287fb9a2aa832dc2d3e6f9': Extra to always show advanced devices.
Diffstat (limited to 'packages/ExternalStorageProvider')
-rw-r--r--packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index d42354f..65e3eee 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -394,7 +394,7 @@ public class ExternalStorageProvider extends DocumentsProvider {
private static String getTypeForName(String name) {
final int lastDot = name.lastIndexOf('.');
if (lastDot >= 0) {
- final String extension = name.substring(lastDot + 1);
+ final String extension = name.substring(lastDot + 1).toLowerCase();
final String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
if (mime != null) {
return mime;
@@ -411,7 +411,7 @@ public class ExternalStorageProvider extends DocumentsProvider {
private static String removeExtension(String mimeType, String name) {
final int lastDot = name.lastIndexOf('.');
if (lastDot >= 0) {
- final String extension = name.substring(lastDot + 1);
+ final String extension = name.substring(lastDot + 1).toLowerCase();
final String nameMime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
if (mimeType.equals(nameMime)) {
return name.substring(0, lastDot);