commit 8063fe0e68e744e65e838998161443daf26ac726
author Zak Cohen <zakcohen@google.com> Mon Jun 29 04:52:22 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 29 04:52:22 2020 +0000
tree 1ce8ff89f656d5fe8370e7233fba211141d691c0
parent 843b900ccfe901180ed69e2dd233d5595aa48f8a
parent a3629bd52c751b1129815baea031b7d6b8092453

Thumbnail Cache - check canceled status on the right thread. am: a3629bd52c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12029197

Change-Id: I1b99714506e408d145b6d03a49cea621ef290781

quickstep/src/com/android/quickstep/TaskThumbnailCache.java

diff --git a/quickstep/src/com/android/quickstep/TaskThumbnailCache.java b/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
index ace6743..2b7a8ec 100644
--- a/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
+++ b/quickstep/src/com/android/quickstep/TaskThumbnailCache.java
@@ -166,11 +166,13 @@
             public void run() {
                 ThumbnailData thumbnail = ActivityManagerWrapper.getInstance().getTaskThumbnail(
                         key.id, lowResolution);
-                if (isCanceled()) {
-                    // We don't call back to the provided callback in this case
-                    return;
-                }
+
                 MAIN_EXECUTOR.execute(() -> {
+                    if (isCanceled()) {
+                        // We don't call back to the provided callback in this case
+                        return;
+                    }
+
                     mCache.put(key, thumbnail);
                     callback.accept(thumbnail);
                     onEnd();