commit 03f0c674200362f57498f4063edcfb1b26133205
author Thales Lima <tsuharesu@google.com> Wed Jul 14 09:54:10 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 14 09:54:10 2021 +0000
tree 1f077e9bf7b0427954281b502fe3a95bc9e479c6
parent 7c50c2fa2af945555d287f9cf49d0b234297b208
parent 9c1024759ff026cb6b4303c701caadabb1ffc45d

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

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