summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2020-07-01 01:08:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-07-01 01:08:38 +0000
commit92d8d6c3846b2b423c329499b7f99bf78d9e3ee8 (patch)
tree0a88f221f05d1a260847e3dd962d72679b5ddcf0
parent118966e45c84c6790e475f370c543adda500efe0 (diff)
parent874eb9f9cb83f592783035e2a261ce18de2f88bc (diff)
Merge "Move the pinned task to front when dismissed split-screen" into rvc-dev
-rw-r--r--services/core/java/com/android/server/wm/ActivityStackSupervisor.java2
1 files changed, 1 insertions, 1 deletions
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 */);
}