Merge "Merge "Handle the case where launch root is not attached" into udc-dev... (5234f9f0) · Commits · e / os / android_frameworks_base

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;
		}