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

Commit 5499cf75 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Fix SystemUI crash from continues launch task with setLaunchRootTask"... 

Merge "Fix SystemUI crash from continues launch task with setLaunchRootTask" into udc-dev am: 61730e62 am: 8e9d61e7

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



Change-Id: I9fc7de12b9bedf10141ab76d15b5fe436ea94ccc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 512ceeec 8e9d61e7

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

+6 −1
Original line number Diff line number Diff line
@@ -3327,9 +3327,14 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            if (aOptions != null) {

                // Resolve the root task the task should be placed in now based on options

                // and reparent if needed.

                // TODO(b/229927851) For split-screen, setLaunchRootTask is no longer the "root"

                // task, consider to rename methods like "parentTask" instead of "rootTask".

                final Task targetRootTask =

                        getOrCreateRootTask(null, aOptions, task, onTop);

                if (targetRootTask != null && task.getRootTask() != targetRootTask) {

                // When launch with ActivityOptions#getLaunchRootTask, the "root task" just mean the

                // parent of current launch, not the "root task" in hierarchy.

                if (targetRootTask != null && task.getRootTask() != targetRootTask

                        && task.getParent() != targetRootTask) {

                    final int reparentMode = onTop

                            ? REPARENT_MOVE_ROOT_TASK_TO_FRONT : REPARENT_LEAVE_ROOT_TASK_IN_PLACE;

                    task.reparent(targetRootTask, onTop, reparentMode, ANIMATE, DEFER_RESUME,