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

Commit 24ba3234 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Do not delete stacks that are not empty." into klp-dev

parents 534103d4 19d9bd54

services/java/com/android/server/am/ActivityRecord.java

+6 −1
Original line number Diff line number Diff line
@@ -480,7 +480,12 @@ final class ActivityRecord { 


    void setTask(TaskRecord newTask, ThumbnailHolder newThumbHolder, boolean isRoot) {

        if (task != null && task.removeActivity(this)) {

            if (task != newTask) {

                mStackSupervisor.removeTask(task);

            } else {

                Slog.d(TAG, "!!! REMOVE THIS LOG !!! setTask: nearly removed stack=" +

                        (newTask == null ? null : newTask.stack));

            }

        }

        if (inHistory && !finishing) {

            if (task != null) {