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

Commit 997e3c83 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Reset DisplayContent while a Task is removed from the hierarchy" into main

parents 7f0b1598 6b8dd93f

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

+1 −11
Original line number Diff line number Diff line
@@ -1122,17 +1122,6 @@ class Task extends TaskFragment { 
        // already ran fully within super.onParentChanged

        updateTaskOrganizerState();



        // TODO(b/168037178): The check for null display content and setting it to null doesn't

        //                    really make sense here...



        // TODO(b/168037178): This is mostly taking care of the case where the stask is removing

        //                    from the display, so we should probably consolidate it there instead.



        if (getParent() == null && mDisplayContent != null) {

            mDisplayContent = null;

            mWmService.mWindowPlacerLocked.requestTraversal();

        }



        if (oldParent != null) {

            final Task oldParentTask = oldParent.asTask();

            if (oldParentTask != null) {
@@ -2770,6 +2759,7 @@ class Task extends TaskFragment { 
        }



        super.removeImmediately();

        mDisplayContent = null;

        mRemoving = false;

    }