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

Commit ed7fc797 authored by Shengsong Tan's avatar Shengsong Tan
Browse files

Check is leaf task before remove its child containers 

This CL change the leaf check in removeIfPossilbe().

Previously, after removeImmediately() get called, all child
containers will be removed, then isLeafTask() will always return
true due to no more child for current entity.

Bug: 177858817
Bug: 206556390
Test: CTS
Change-Id: Id645fe58442662bb26c98cba488e8d9e684ab4bc
parent f2ec759e

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -738,8 +738,9 @@ class Task extends TaskFragment { 
                    "removeTask:" + reason + " deferring removing taskId=" + mTaskId);

                    "removeTask:" + reason + " deferring removing taskId=" + mTaskId);

            return;

            return;

        }

        }

        final boolean isLeafTask = isLeafTask();

        removeImmediately(reason);

        removeImmediately(reason);

        if (isLeafTask()) {

        if (isLeafTask) {

            mAtmService.getTaskChangeNotificationController().notifyTaskRemoved(mTaskId);

            mAtmService.getTaskChangeNotificationController().notifyTaskRemoved(mTaskId);





            final TaskDisplayArea taskDisplayArea = getDisplayArea();

            final TaskDisplayArea taskDisplayArea = getDisplayArea();