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

Merge "Clean up resources before detaching the task from hierarchy"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-06 07:35:42 +00:00
committed by Android (Google) Code Review
parent 5b0ee657e0 8bda232355
commit ceba54efaa
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/wm/Task.java
View File

@@ -968,6 +968,11 @@ class Task extends WindowContainer<WindowContainer> {
final ActivityStack oldStack = ((ActivityStack) oldParent);
final ActivityStack newStack = ((ActivityStack) newParent);
// Task is going to be removed, clean it up before detaching from hierarchy.
if (oldParent != null && newParent == null) {
cleanUpResourcesForDestroy();
}
mStack = newStack;
super.onParentChanged(newParent, oldParent);
@@ -1012,12 +1017,6 @@ class Task extends WindowContainer<WindowContainer> {
updateOverrideConfigurationFromLaunchBounds();
}
// Task is being removed.
if (oldParent != null && newParent == null) {
cleanUpResourcesForDestroy();
}
// Update task bounds if needed.
adjustBoundsForDisplayChangeIfNeeded(getDisplayContent());