Merge "Merge "Move the pinned task to front when dismissed split-screen" into rvc-dev am: 92d8d6c384 am: c10b144bc2 am: ea838912fa" into rvc-qpr-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker
2020-07-01 01:49:14 +00:00
committed by Android (Google) Code Review

View File

@@ -2177,7 +2177,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
// split-screen in split-screen. // split-screen in split-screen.
mService.getTaskChangeNotificationController() mService.getTaskChangeNotificationController()
.notifyActivityDismissingDockedStack(); .notifyActivityDismissingDockedStack();
taskDisplayArea.onSplitScreenModeDismissed(task.getStack()); taskDisplayArea.onSplitScreenModeDismissed((ActivityStack) task);
taskDisplayArea.mDisplayContent.ensureActivitiesVisible(null, 0, PRESERVE_WINDOWS, taskDisplayArea.mDisplayContent.ensureActivitiesVisible(null, 0, PRESERVE_WINDOWS,
true /* notifyClients */); true /* notifyClients */);
} }