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

Commit 030049aa 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: 74594fb3

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



Change-Id: Iee7048d25678474331099360c1245c0fd1749ef8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b9211d9 74594fb3

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

+6 −1
Original line number Diff line number Diff line
@@ -3310,9 +3310,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,