summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2020-07-01 01:19:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-01 01:19:09 +0000
commitc10b144bc20b32bd2bb8a53709d744a87f457fcb (patch)
tree3c3fac6321d4a456eab0df26fe52317933053697
parent40f1fc932c467b2cb02b822de46bf986ce0b075b (diff)
parent92d8d6c3846b2b423c329499b7f99bf78d9e3ee8 (diff)
Merge "Move the pinned task to front when dismissed split-screen" into rvc-dev am: 92d8d6c384
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034169 Change-Id: I50ce392e73bf2d4970280c332b5a8819282407e6
-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 */);
}