Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19083174

Change-Id: I1feedef310d934378a25e98b4bdafba1e33bb0e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shengsong Tan
2022-07-05 11:13:49 +00:00
committed by Automerger Merge Worker
parent fc52852381 3f5ba37675
commit 21bde2c551
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/Task.java
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();