commit b19061c6827780f31e4247ff7eaf47e153098e55
author Tomasz Mikolajewski <mtomasz@google.com> Mon Feb 13 17:33:42 2017 +0900
committer Tomasz Mikolajewski <mtomasz@google.com> Tue Feb 14 15:58:27 2017 +0900
tree 36fff6f3057e57f91be957b8a5f4193e62aa6f23
parent 700f9716c4bc6cbd19e94471f4db3805d3caab2b

Remove cache, and manually control archives lifecycle.

This will reduce memory consumption, copying flakyness and
simplify code.

Test: Unit tests.
Bug: 35303895, 35151292
Change-Id: I7124cf3c3ec897887171dffb80eddfe99a6a7c41

src/com/android/documentsui/DirectoryLoader.java

diff --git a/src/com/android/documentsui/DirectoryLoader.java b/src/com/android/documentsui/DirectoryLoader.java
index c0f69fc..8720701 100644
--- a/src/com/android/documentsui/DirectoryLoader.java
+++ b/src/com/android/documentsui/DirectoryLoader.java
@@ -30,6 +30,7 @@
 import android.provider.DocumentsContract.Document;
 import android.util.Log;
 
+import com.android.documentsui.archives.ArchivesProvider;
 import com.android.documentsui.base.DocumentInfo;
 import com.android.documentsui.base.FilteringCursorWrapper;
 import com.android.documentsui.base.RootInfo;
@@ -92,6 +93,10 @@
         Cursor cursor;
         try {
             client = DocumentsApplication.acquireUnstableProviderOrThrow(resolver, authority);
+            if (mDoc.isInArchive()) {
+                ArchivesProvider.acquireArchive(client, mUri);
+            }
+            result.client = client;
             cursor = client.query(
                     mUri, null, null, null, mModel.getDocumentSortQuery(), mSignal);
             if (cursor == null) {
@@ -108,8 +113,6 @@
             }
 
             cursor = mModel.sortCursor(cursor);
-
-            result.client = client;
             result.cursor = cursor;
         } catch (Exception e) {
             Log.w(TAG, "Failed to query", e);
@@ -118,6 +121,7 @@
             synchronized (this) {
                 mSignal = null;
             }
+            // TODO: Remove this call.
             ContentProviderClient.releaseQuietly(client);
         }