commit 5f8cb1b701ecdab63b56a9d5b92a673b2722bf8e
author Alex Chau <alexchau@google.com> Wed Sep 01 17:45:39 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 01 17:45:39 2021 +0000
tree af5ea8b4b8a4371e7e233d3274bc3cb992a5d6bf
parent 93e610d986b863d985afee5ae3ad4ce41354ec70
parent eb47ebddb163fc117b8a25a5e3692332a862e535

Only restore previous currentPage in applyLoadPlan if mCurrentPage is outdated am: f0b8ef9dfd am: eb47ebddb1

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

Change-Id: I025e97a118b613798db6edb8490365a4d55822b3

quickstep/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 6aa7e06..e99835e 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1367,7 +1367,10 @@
         } else if (currentTaskId != -1) {
             currentTaskView = getTaskViewByTaskId(currentTaskId);
             if (currentTaskView != null) {
-                setCurrentPage(indexOfChild(currentTaskView));
+                int currentTaskViewIndex = indexOfChild(currentTaskView);
+                if (mCurrentPage != currentTaskViewIndex) {
+                    setCurrentPage(currentTaskViewIndex);
+                }
             }
         }