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

This commit is contained in:
Shengsong Tan
2022-07-05 11:00:42 +00:00
committed by Android (Google) Code Review

View File

@@ -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();