commit 7335d4300752b22479c23a8598859044e2082a48
author Tomasz Mikolajewski <mtomasz@google.com> Thu Dec 24 02:21:48 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 24 02:21:48 2015 +0000
tree 79a12431f0419ce133a886410584a3e26176031b
parent 39d1f6646a11971b63d9d58a8ffdda3d41d9953a
parent 7e326a867c12222c7fb359d2ce9ab0b95b8ab6c4

Merge "Wire thumbnails in archives in ExternalStorageProvider."

packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java

diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index bc09f3a..c6e5531 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -579,6 +579,10 @@
     public AssetFileDescriptor openDocumentThumbnail(
             String documentId, Point sizeHint, CancellationSignal signal)
             throws FileNotFoundException {
+        if (mArchiveHelper.isArchivedDocument(documentId)) {
+            return mArchiveHelper.openDocumentThumbnail(documentId, sizeHint, signal);
+        }
+
         final File file = getFileForDocId(documentId);
         return DocumentsContract.openImageThumbnail(file);
     }