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

Commit 085c27f7 authored by Shengsong Tan's avatar Shengsong Tan Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I20d47018b3cc52119f56b0ed22f37bb6bccbde6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d17c4393 21bde2c5

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