From f0b8ef9dfd26960b867cf5dd8a0d8351f8d668fd Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 1 Sep 2021 15:10:37 +0100
Subject: [PATCH] Only restore previous currentPage in applyLoadPlan if
 mCurrentPage is outdated

Bug: 197493120
Test: manual
Change-Id: I196088c848f9fa8ec23f6c803226d674ba3e088b
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 6aa7e061e6..e99835e0c8 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1367,7 +1367,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         } else if (currentTaskId != -1) {
             currentTaskView = getTaskViewByTaskId(currentTaskId);
             if (currentTaskView != null) {
-                setCurrentPage(indexOfChild(currentTaskView));
+                int currentTaskViewIndex = indexOfChild(currentTaskView);
+                if (mCurrentPage != currentTaskViewIndex) {
+                    setCurrentPage(currentTaskViewIndex);
+                }
             }
         }