commit 06d3cbdbc7c8fb52b6660e6df5b1258e1eaff6c1
author Zak Cohen <zakcohen@google.com> Mon Jun 29 22:22:17 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 29 22:22:17 2020 +0000
tree b74d42b4dd6d976c3464099143e5be8b2b9d7ec0
parent 2d0f86d986a96afc117f2d2dc8505aa281399921
parent 19797b419b490cd56c048f37b7592b80dcf12f41

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

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

Change-Id: I407be8a43fc607be1872285b72d753b532b3c41f

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