Merge "Move the pinned task to front when dismissed split-screen" into rvc-dev am: 92d8d6c384 am: 9b2e5941ad

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034169 Change-Id: I37010a19e5477c8af16b82a08011de345308832a
2020-07-01 01:36:42 +00:00
parent f3a171760f 9b2e5941ad
commit 1cbf002f46
1 changed files with 1 additions and 1 deletions
--- 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 */);
            }