From 874eb9f9cb83f592783035e2a261ce18de2f88bc Mon Sep 17 00:00:00 2001
From: Louis Chang <louischang@google.com>
Date: Tue, 30 Jun 2020 16:10:28 +0800
Subject: Move the pinned task to front when dismissed split-screen

Split-screen was dismissed after pinning task, but the
pinned task was not moved to front because the split-screen
secondary organized task was moved to top instead.

Bug: 160153401
Test: pin task in split-screen
Change-Id: Ib327203d5a15c86b5bf00e10a537f253a4bc2359
---
 services/core/java/com/android/server/wm/ActivityStackSupervisor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
index 407b9fcbca74..edb3a9ca99c3 100644
--- a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
@@ -2177,7 +2177,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
                 // split-screen in split-screen.
                 mService.getTaskChangeNotificationController()
                         .notifyActivityDismissingDockedStack();
-                taskDisplayArea.onSplitScreenModeDismissed(task.getStack());
+                taskDisplayArea.onSplitScreenModeDismissed((ActivityStack) task);
                 taskDisplayArea.mDisplayContent.ensureActivitiesVisible(null, 0, PRESERVE_WINDOWS,
                         true /* notifyClients */);
             }
-- 
cgit v1.2.3-59-g8ed1b