commit c292378d3b7a6ebb3ebd5caef631a76a386c2974
author Garfield, Tan <xutan@google.com> Tue Jun 07 15:09:51 2016 -0700
committer Garfield, Tan <xutan@google.com> Tue Jun 07 15:37:58 2016 -0700
tree 8cb0a56c046e5b844c20b8e508f79c0e980f757c
parent 446484ca7786bdaac99a7cb39412ffc0e9afe513

Recycle after return to avoid returning an invalid value.

Also add some main thread assertions.

Change-Id: Id6314d6e92d530ce57a01902b5570381fa20044d

src/com/android/documentsui/ThumbnailCache.java

diff --git a/src/com/android/documentsui/ThumbnailCache.java b/src/com/android/documentsui/ThumbnailCache.java
index 53f5092..ee2f168 100644
--- a/src/com/android/documentsui/ThumbnailCache.java
+++ b/src/com/android/documentsui/ThumbnailCache.java
@@ -22,6 +22,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.net.Uri;
+import android.os.Looper;
 import android.util.LruCache;
 import android.util.Pair;
 import android.util.Pools;
@@ -195,6 +196,9 @@
 
         private static Result obtain(@Status int status, @Nullable Bitmap thumbnail,
                 @Nullable Point size, long lastModified) {
+            // Make sure this method is only called from main thread.
+            assert(Looper.myLooper() == Looper.getMainLooper());
+
             Result instance = sPool.acquire();
             instance = (instance != null ? instance : new Result());
 
@@ -209,6 +213,9 @@
         private Result() {}
 
         public void recycle() {
+            // Make sure this method is only called from main thread.
+            assert(Looper.myLooper() == Looper.getMainLooper());
+
             mStatus = -1;
             mThumbnail = null;
             mSize = null;