commit 8914c024f08d6d8c72a63dc4bb93e13950f7bfa4
author Zak Cohen <zakcohen@google.com> Mon Jun 29 22:35:04 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 29 22:35:04 2020 +0000
tree cb484821430398866cda1d7286db5ce22a018bb6
parent 67aa2999901532dac8e47138398a78b595898d92
parent 987ba0261f9de50af682ce40c0fb5fdc2699119f

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

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

Change-Id: I28c19e404e9dbeded829c3eb73ab55bcdc076349

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