diff options
| author | 2022-07-05 11:31:40 +0000 | |
|---|---|---|
| committer | 2022-07-05 11:31:40 +0000 | |
| commit | 085c27f7ef5f3432a6f7bd92a9c34c0a5ab1fa4f (patch) | |
| tree | 80812f447f25b1da5a89ca611937db2a225cb158 | |
| parent | d17c4393dff83548ffdd9ddb479c0a33ebc19a2b (diff) | |
| parent | 21bde2c5518910b17f69b8bcf248f578603ecf14 (diff) | |
Merge "Check is leaf task before remove its child containers" into tm-qpr-dev am: 3f5ba37675 am: 21bde2c551
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19083174
Change-Id: I20d47018b3cc52119f56b0ed22f37bb6bccbde6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/Task.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 1525fb3930d6..e65f0bbc1e55 100644 --- 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(); |