commit 00f57e0c74963185e6f9e071ec19f1085f98ed39
author Thales Lima <tsuharesu@google.com> Wed Jul 14 10:20:23 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 14 10:20:23 2021 +0000
tree 9b86597454d43099626d656f7fadb47274cbb76f
parent 255f1f0302eb1b866e98c7d5c11657a234f7429b
parent 9ddcedd49ae1e048ef9279a4cd8a96c1b62c2dcd

Merge "launcher: check if task still exists before leaving it in focus" into sc-v2-dev am: 03f0c67420 am: 9ddcedd49a

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

Change-Id: I2ca15b7f9b8c182fe4f2ed49960fe55b923c5ec0

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 6d3f855..d03ea1d 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1158,7 +1158,9 @@
             final TaskView taskView = (TaskView) getChildAt(pageIndex);
             taskView.bind(task, mOrientationState);
         }
-        if (mFocusedTaskId == -1 && getTaskViewCount() > 0) {
+
+        // If the list changed, maybe the focused task doesn't exist anymore
+        if (getFocusedTaskView() == null && getTaskViewCount() > 0) {
             mFocusedTaskId = getTaskViewAt(0).getTaskId();
         }
         updateTaskSize();