Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 851bfa51 authored Aug 09, 2023 by Treehugger Robot Committed by Automerger Merge Worker Aug 09, 2023

Merge "Do not associate staring window to task for rotation change" into udc-qpr-dev am: 8cfba905

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24353580

Change-Id: I8e87ec18b6481685ed4c64ddcbaccc04899604df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents a6ebbf34 8cfba905

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -2334,6 +2334,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		mDisplayContent.updateImeControlTarget(isImeLayeringTarget() /* updateImeParent */);
		// Fix the starting window to task when Activity has changed.
		if (mStartingData != null && mStartingData.mAssociatedTask == null
		&& mTempConfiguration.windowConfiguration.getRotation()
		== selfConfiguration.windowConfiguration.getRotation()
		&& !mTempConfiguration.windowConfiguration.getBounds().equals(getBounds())) {
		mStartingData.mResizedFromTransfer = true;
		// Lock the starting window to task, so it won't resize from transfer anymore.

services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -2939,6 +2939,9 @@ public class ActivityRecordTests extends WindowTestsBase {
		// transform to activity1.
		int rotation = (mDisplayContent.getRotation() + 1) % 4;
		mDisplayContent.setFixedRotationLaunchingApp(activity, rotation);
		// The configuration with rotation change should not trigger task-association.
		assertNotNull(activity.mStartingData);
		assertNull(activity.mStartingData.mAssociatedTask);
		doReturn(rotation).when(mDisplayContent)
		.rotationForActivityInDifferentOrientation(topActivity);