Merge "Disallow reparenting into a leaf task." into main (235c0056) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -1338,6 +1338,15 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
		if (isLockTaskModeViolation(wc.getParent(), wc.asTask(), isInLockTaskMode)) {
		break;
		}
		} else if (type == HIERARCHY_OP_TYPE_REPARENT && hop.getNewParent() != null) {
		final WindowContainer parentWc = WindowContainer.fromBinder(hop.getNewParent());
		final Task parentTask = parentWc != null ? parentWc.asTask() : null;
		if (parentTask != null && parentTask.isLeafTask()
		&& parentTask.hasDirectChildActivities()) {
		Slog.w(TAG, "Skip applying hierarchy operation " + hop
		+ " on a leaf task.");
		break;
		}
		}
		if (syncId >= 0) {
		addToSyncSet(syncId, wc);