From ca4c321ffe800aa679aa2c84a59090c1da2b6e15 Mon Sep 17 00:00:00 2001
From: Jeremy Sim <jeremysim@google.com>
Date: Tue, 18 Jul 2023 16:07:44 -0700
Subject: [PATCH] Fix order invariance when checking for GroupedTaskViews

This patch makes it so that Overview will return the correct GroupedTaskView even when the set of taskIds passed in is in the opposite order.

Previously, we didn't account for order variation when checking for a GroupedTaskView, which would cause bugs when the GroupedTaskView had had its ordering swapped.

Fixed by modifying getTaskViewByTaskIds() to return true even if the order of ids was swapped.

Fixes: 290135090
Test: Manual
Change-Id: I2d94fadfee3cd478801b25cdbc699295179c8bd1
---
 .../src/com/android/quickstep/views/RecentsView.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 6f16f41e2c..e7fc09e1c5 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1369,9 +1369,15 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
             return null;
         }
 
+        // We're looking for a taskView that matches these ids, regardless of order
+        int[] taskIdsCopy = Arrays.copyOf(taskIds, taskIds.length);
+        Arrays.sort(taskIdsCopy);
+
         for (int i = 0; i < getTaskViewCount(); i++) {
             TaskView taskView = requireTaskViewAt(i);
-            if (Arrays.equals(taskIds, taskView.getTaskIds())) {
+            int[] taskViewIdsCopy = taskView.getTaskIds();
+            Arrays.sort(taskViewIdsCopy);
+            if (Arrays.equals(taskIdsCopy, taskViewIdsCopy)) {
                 return taskView;
             }
         }