Merge "Fix last bit of WidgetTray jank issue b/21133230" into ub-launcher3-burnaby

src/com/android/launcher3/WidgetPreviewLoader.java

@@ -56,6 +56,8 @@ public class WidgetPreviewLoader {
     /**
      * Weak reference objects, do not prevent their referents from being made finalizable,
      * finalized, and then reclaimed.
+     * Note: synchronized block used for this variable is expensive and the block should always
+     * be posted to a background thread.
      */
     @Thunk Set<Bitmap> mUnusedBitmaps =
             Collections.newSetFromMap(new WeakHashMap<Bitmap, Boolean>());
@@ -555,10 +557,15 @@ public class WidgetPreviewLoader {
             // in the tasks's onCancelled() call, and if cancelled while the task is writing to
             // disk, it will be cancelled in the task's onPostExecute() call.
             if (mTask.mBitmapToRecycle != null) {
-                synchronized (mUnusedBitmaps) {
+                mWorkerHandler.post(new Runnable() {
-                    mUnusedBitmaps.add(mTask.mBitmapToRecycle);
+                    @Override
-                }
+                    public void run() {
-                mTask.mBitmapToRecycle = null;
+                        synchronized (mUnusedBitmaps) {
+                            mUnusedBitmaps.add(mTask.mBitmapToRecycle);
+                        }
+                        mTask.mBitmapToRecycle = null;
+                    }
+                });
             }
         }
     }
@@ -661,14 +668,19 @@ public class WidgetPreviewLoader {
         }
 
         @Override
-        protected void onCancelled(Bitmap preview) {
+        protected void onCancelled(final Bitmap preview) {
             // If we've cancelled while the task is running, then can return the bitmap to the
             // recycled set immediately. Otherwise, it will be recycled after the preview is written
             // to disk.
             if (preview != null) {
-                synchronized (mUnusedBitmaps) {
+                mWorkerHandler.post(new Runnable() {
-                    mUnusedBitmaps.add(preview);
+                    @Override
-                }
+                    public void run() {
+                        synchronized (mUnusedBitmaps) {
+                            mUnusedBitmaps.add(preview);
+                        }
+                    }
+                });
             }
         }
     }