commit a3629bd52c751b1129815baea031b7d6b8092453
author Zak Cohen <zakcohen@google.com> Sun Jun 28 20:34:48 2020 -0700
committer Zak Cohen <zakcohen@google.com> Sun Jun 28 21:10:07 2020 -0700
tree e7f647d6a2cc64e0b74bc718bd8b9e6f4c1e96ab
parent f6edf9890280224e3e938a36a7dcc6d1e30ff572

Thumbnail Cache - check canceled status on the right thread.

The cache was checking the canceled status on the background
thread, but the cancel call was being made on the main thread.
This was leading to canceled requests still delivering this thumbnail
in some cases.

Bug: 159840851
Test: local build and non-repo of bug
Change-Id: I9a3556f6570eee1db39ebec202c115d58010d7f8

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