diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-10-15 04:02:48 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-15 04:02:48 -0700 |
commit | d70d2d8ee3f4c31aa78474fd9efb865395b2249e (patch) | |
tree | 7bd6f2b9deb0d6d3ab8b09868c230f30bdc1a29e /packages/ExternalStorageProvider | |
parent | 21a31f9e1199ce710a2509e49ef7e1b7d610b0bd (diff) | |
parent | 25b99efb3259c9f6d7bcdacd3cb2bafd6b1a0e63 (diff) | |
download | frameworks_base-d70d2d8ee3f4c31aa78474fd9efb865395b2249e.zip frameworks_base-d70d2d8ee3f4c31aa78474fd9efb865395b2249e.tar.gz frameworks_base-d70d2d8ee3f4c31aa78474fd9efb865395b2249e.tar.bz2 |
am 25b99efb: am ac0cb359: am 8e656df0: Merge "Add extras to AFD, send orientation metadata." into klp-dev
* commit '25b99efb3259c9f6d7bcdacd3cb2bafd6b1a0e63':
Add extras to AFD, send orientation metadata.
Diffstat (limited to 'packages/ExternalStorageProvider')
-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) { |