Merge "Ensure child task has activity type set" into tm-qpr-dev (54115fb7) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -8945,6 +8945,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A

		final boolean wasInPictureInPicture = inPinnedWindowingMode();
		final DisplayContent display = mDisplayContent;
		final int activityType = getActivityType();
		if (wasInPictureInPicture && attachedToProcess() && display != null) {
		// If the PIP activity is changing to fullscreen with display orientation change, the
		// fixed rotation will take effect that requires to send fixed rotation adjustments
		@@ -8969,6 +8970,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		} else {
		super.onConfigurationChanged(newParentConfig);
		}
		if (activityType != ACTIVITY_TYPE_UNDEFINED
		&& activityType != getActivityType()) {
		Slog.w(TAG, "Can't change activity type once set: " + this
		+ " activityType=" + activityTypeToString(getActivityType()));
		}

		// Configuration's equality doesn't consider seq so if only seq number changes in resolved
		// override configuration. Therefore ConfigurationContainer doesn't change merged override

+3 −0

Original line number	Diff line number	Diff line
		@@ -5884,8 +5884,11 @@ class Task extends TaskFragment {
		final int taskId = activity != null
		? mTaskSupervisor.getNextTaskIdForUser(activity.mUserId)
		: mTaskSupervisor.getNextTaskIdForUser();
		final int activityType = getActivityType();
		task = new Task.Builder(mAtmService)
		.setTaskId(taskId)
		.setActivityType(activityType != ACTIVITY_TYPE_UNDEFINED ? activityType
		: ACTIVITY_TYPE_STANDARD)
		.setActivityInfo(info)
		.setActivityOptions(options)
		.setIntent(intent)