diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-10-15 00:00:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-15 00:00:20 +0000 |
commit | 8e656df0929b352660fd6d6209eabc4267c1941f (patch) | |
tree | 36a5e4edcb4b000251e0e80041df505bf4cfbc70 /packages | |
parent | b3a08be2a1a39ff2b1e59975e55b7c9f0171b177 (diff) | |
parent | c1c8f3f97d344a24bfddcb56a8be05e7e2fabe9e (diff) | |
download | frameworks_base-8e656df0929b352660fd6d6209eabc4267c1941f.zip frameworks_base-8e656df0929b352660fd6d6209eabc4267c1941f.tar.gz frameworks_base-8e656df0929b352660fd6d6209eabc4267c1941f.tar.bz2 |
Merge "Add extras to AFD, send orientation metadata." into klp-dev
Diffstat (limited to 'packages')
-rw-r--r-- | packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index 189e985..11ff2d8 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -27,6 +27,7 @@ import android.os.Environment; import android.os.ParcelFileDescriptor; import android.provider.DocumentsContract.Document; import android.provider.DocumentsContract.Root; +import android.provider.DocumentsContract; import android.provider.DocumentsProvider; import android.webkit.MimeTypeMap; @@ -313,19 +314,7 @@ public class ExternalStorageProvider extends DocumentsProvider { String documentId, Point sizeHint, CancellationSignal signal) throws FileNotFoundException { final File file = getFileForDocId(documentId); - final ParcelFileDescriptor pfd = ParcelFileDescriptor.open( - file, ParcelFileDescriptor.MODE_READ_ONLY); - - try { - final ExifInterface exif = new ExifInterface(file.getAbsolutePath()); - final long[] thumb = exif.getThumbnailRange(); - if (thumb != null) { - return new AssetFileDescriptor(pfd, thumb[0], thumb[1]); - } - } catch (IOException e) { - } - - return new AssetFileDescriptor(pfd, 0, AssetFileDescriptor.UNKNOWN_LENGTH); + return DocumentsContract.openImageThumbnail(file); } private static String getTypeForFile(File file) { |