Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ceba54ef authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 5b0ee657 8bda2323

services/core/java/com/android/server/wm/Task.java

+5 −6
Original line number Diff line number Diff line
@@ -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());