commit 7ceb6f358aae69e69705408e2d35774afdd33a0e
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 27 21:33:07 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 27 21:33:07 2019 +0000
tree 88af594d9428ad3348f492f295cfb2691e9e9216
parent 6ab083273940c796fd5ab4853bb9c55131aa33e6
parent ccbb4f3bf3a84172a1c8da9dc8ef4e00d6e92042

Merge "Fix RecentTasksList change id incrementing" into ub-launcher3-master

quickstep/src/com/android/quickstep/RecentTasksList.java

diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java
index 00b3e90..e15a3f1 100644
--- a/quickstep/src/com/android/quickstep/RecentTasksList.java
+++ b/quickstep/src/com/android/quickstep/RecentTasksList.java
@@ -60,6 +60,7 @@
         mBgThreadExecutor = BackgroundExecutor.get();
         mKeyguardManager = new KeyguardManagerCompat(context);
         mChangeId = 1;
+        ActivityManagerWrapper.getInstance().registerTaskStackListener(this);
     }
 
     /**
@@ -97,6 +98,7 @@
         if (mLastLoadedId == mChangeId && (!mLastLoadHadKeysOnly || loadKeysOnly)) {
             // The list is up to date, callback with the same list
             mMainThreadExecutor.execute(resultCallback);
+            return requestLoadId;
         }
 
         // Kick off task loading in the background