Merge "Check is leaf task before remove its child containers" into tm-qpr-dev

2022-07-05 11:00:42 +00:00
parent 692d4e65c9 ed7fc7970f
commit 3f5ba37675
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -738,8 +738,9 @@ class Task extends TaskFragment {
                    "removeTask:" + reason + " deferring removing taskId=" + mTaskId);
            return;
        }
+        final boolean isLeafTask = isLeafTask();
        removeImmediately(reason);
-        if (isLeafTask()) {
+        if (isLeafTask) {
            mAtmService.getTaskChangeNotificationController().notifyTaskRemoved(mTaskId);

            final TaskDisplayArea taskDisplayArea = getDisplayArea();