commit eb47ebddb163fc117b8a25a5e3692332a862e535
author Alex Chau <alexchau@google.com> Wed Sep 01 17:24:33 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 01 17:24:33 2021 +0000
tree 83a0c3ee08d9e357db44067de0fd0f138e4b6a28
parent 4009f13212976eb97883c5fa2fb5892899bcf86c
parent f0b8ef9dfd26960b867cf5dd8a0d8351f8d668fd

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

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

Change-Id: I03350faefc6da9545c57b282bc7c2f67f3b87741

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);
+                }
             }
         }