commit 1562c3de187f73ffa89251c02f3184dc50e269bb
author Zak Cohen <zakcohen@google.com> Mon Jun 29 22:59:17 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 29 22:59:17 2020 +0000
tree 36c7f281ce490b52313aac92685e8413fd302417
parent 6fdfb25428f1d50c05dec1d93f70be5fa8d7e309
parent c01ab27bce4a31b26f04d4fe1330fac1ca21d415

Thumbnail Cache - check canceled status on the right thread. am: 19797b419b am: 987ba0261f am: 4163325b9c am: c01ab27bce

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

Change-Id: Ib5e004cae554832050f1a3efff5276bf3399d126

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();