Merge "Direct set activity type to requested config when creating task" into main (4f932a1c) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -6891,7 +6891,9 @@ class Task extends TaskFragment {
		// Set activity type before adding the root task to TaskDisplayArea, so home task can
		// be cached, see TaskDisplayArea#addRootTaskReferenceIfNeeded().
		if (mActivityType != ACTIVITY_TYPE_UNDEFINED) {
		task.setActivityType(mActivityType);
		// Set directly because onParentChanged will propagate it.
		task.getRequestedOverrideConfiguration().windowConfiguration.setActivityType(
		mActivityType);
		}

		if (mParent != null) {