Merge "Fixes incorrect task bounds while moving a split-screen task to desk" into main (349a3384) · Commits · e / os / android_frameworks_base

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

+1 −11

Original line number	Diff line number	Diff line
		@@ -1238,7 +1238,7 @@ class Task extends TaskFragment {
		mRootWindowContainer.updateUIDsPresentOnDisplay();
		}

		private boolean isOverrideBoundsAllowed() {
		boolean isOverrideBoundsAllowed() {
		Task parentTask = getParent() != null ? getParent().asTask() : null;
		while (parentTask != null) {
		if (parentTask.mDisallowOverrideBoundsForChildren) {
		@@ -2177,16 +2177,6 @@ class Task extends TaskFragment {
		}
		}

		@Override
		public void onRequestedOverrideConfigurationChanged(
		@NonNull Configuration overrideConfiguration) {
		if (!overrideConfiguration.windowConfiguration.getBounds().isEmpty()
		&& !isOverrideBoundsAllowed()) {
		overrideConfiguration.windowConfiguration.setBounds(new Rect());
		}
		super.onRequestedOverrideConfigurationChanged(overrideConfiguration);
		}

		@Override
		public void onConfigurationChanged(Configuration newParentConfig) {
		if (mDisplayContent != null

+6 −1

Original line number	Diff line number	Diff line
		@@ -2375,6 +2375,12 @@ class TaskFragment extends WindowContainer<WindowContainer> {
		mTmpBounds.set(getResolvedOverrideConfiguration().windowConfiguration.getBounds());
		super.resolveOverrideConfiguration(newParentConfig);
		final Configuration resolvedConfig = getResolvedOverrideConfiguration();
		final Task thisTask = asTask();
		if (!resolvedConfig.windowConfiguration.getBounds().isEmpty() && thisTask != null
		&& !thisTask.isOverrideBoundsAllowed()) {
		// clear the bounds if it is not allowed from its ancestors.
		resolvedConfig.windowConfiguration.setBounds(new Rect());
		}

		if (mRelativeEmbeddedBounds != null && !mRelativeEmbeddedBounds.isEmpty()) {
		// For embedded TaskFragment, make sure the bounds is set based on the relative bounds.
		@@ -2402,7 +2408,6 @@ class TaskFragment extends WindowContainer<WindowContainer> {
		}
		}

		final Task thisTask = asTask();
		if (thisTask != null) {
		thisTask.resolveLeafTaskOnlyOverrideConfigs(newParentConfig,
		mTmpBounds /* previousBounds */);