diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-10-25 18:17:52 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-25 18:17:52 -0700 |
commit | de9b66fee1bdbc914c287fb9a2aa832dc2d3e6f9 (patch) | |
tree | dba8154c1eb5513cab372e77d25178b4b737b9f9 /packages/ExternalStorageProvider | |
parent | 33c7520b68e015c46ed1bcb277dc4faaa368cc55 (diff) | |
parent | 3ac436b758830eb938c62d5ed91caa7808b5b63e (diff) | |
download | frameworks_base-de9b66fee1bdbc914c287fb9a2aa832dc2d3e6f9.zip frameworks_base-de9b66fee1bdbc914c287fb9a2aa832dc2d3e6f9.tar.gz frameworks_base-de9b66fee1bdbc914c287fb9a2aa832dc2d3e6f9.tar.bz2 |
am 3ac436b7: am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev
* commit '3ac436b758830eb938c62d5ed91caa7808b5b63e':
Extra to always show advanced devices.
Diffstat (limited to 'packages/ExternalStorageProvider')
-rw-r--r-- | packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java | 4 |
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); |