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

Commit 21bde2c5 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 am: 3f5ba376 

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



Change-Id: I1feedef310d934378a25e98b4bdafba1e33bb0e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc528523 3f5ba376

services/core/java/com/android/server/wm/Task.java

+2 −1
Original line number Diff line number Diff line
@@ -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();