Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move activities to fullscreen stack on display removal"

Browse Source
This commit is contained in:
Andrii Kulian
2017-02-17 18:35:27 +00:00
committed by Android (Google) Code Review
parent 000fd43eec a33818cf1c
commit 580ae91310
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -3774,18 +3774,27 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
}
private void handleDisplayRemoved(int displayId) {
if (displayId == DEFAULT_DISPLAY) {
throw new IllegalArgumentException("Can't remove the primary display.");
}
synchronized (mService) {
ActivityDisplay activityDisplay = mActivityDisplays.get(displayId);
if (activityDisplay != null) {
final boolean destroyContentOnRemoval
= activityDisplay.shouldDestroyContentOnRemove();
ArrayList<ActivityStack> stacks = activityDisplay.mStacks;
for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {
final ActivityStack stack = stacks.get(stackNdx);
moveStackToDisplayLocked(stack.mStackId, DEFAULT_DISPLAY,
!destroyContentOnRemoval /* onTop */);
final ArrayList<ActivityStack> stacks = activityDisplay.mStacks;
while (!stacks.isEmpty()) {
final ActivityStack stack = stacks.get(0);
if (destroyContentOnRemoval) {
moveStackToDisplayLocked(stack.mStackId, DEFAULT_DISPLAY,
false /* onTop */);
stack.finishAllActivitiesLocked(true /* immediately */);
} else {
// Moving all tasks to fullscreen stack, because it's guaranteed to be
// a valid launch stack for all activities. This way the task history from
// external display will be preserved on primary after move.
moveTasksToFullscreenStackLocked(stack.getStackId(), true /* onTop */);
}
}
mActivityDisplays.remove(displayId);