commit 9ddcedd49ae1e048ef9279a4cd8a96c1b62c2dcd
author Thales Lima <tsuharesu@google.com> Wed Jul 14 10:09:54 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 14 10:09:54 2021 +0000
tree 14e9cb0571130ca0935309db7a2938c20e9ab14a
parent 2b39e15f2b094e83ab41ed4fddcc5d56f9502379
parent 03f0c674200362f57498f4063edcfb1b26133205

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

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

Change-Id: Ida8a2d63d6570812555ad55155e9e6111dd06377

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();