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

Commit 6d7ff537 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle the case where launch root is not attached" into udc-dev am: a7afe1ab 

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



Change-Id: I78a6fe73effc2c5ed23477a4f7805a9e5fa0ab86
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5045a7fa a7afe1ab

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

+6 −3
Original line number Diff line number Diff line
@@ -845,11 +845,14 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
            case HIERARCHY_OP_TYPE_SET_LAUNCH_ROOT: {

                final WindowContainer wc = WindowContainer.fromBinder(hop.getContainer());

                final Task task = wc != null ? wc.asTask() : null;

                if (task != null) {

                if (task == null) {

                    throw new IllegalArgumentException("Cannot set non-task as launch root: " + wc);

                } else if (task.getTaskDisplayArea() == null) {

                    throw new IllegalArgumentException("Cannot set a task without display area as "

                            + "launch root: " + wc);

                } else {

                    task.getDisplayArea().setLaunchRootTask(task,

                            hop.getWindowingModes(), hop.getActivityTypes());

                } else {

                    throw new IllegalArgumentException("Cannot set non-task as launch root: " + wc);

                }

                break;

            }