Merge "Do not skip finishing async rotation by a non-rotation transition" into udc-qpr-dev am: 4b8e8ea3a5 am: d55c003a47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24150832
Change-Id: Ib4acbf90cb43f3ed32ad0ecf309bb00b93661597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 467937c..a29aeff 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -1934,7 +1934,7 @@
} else if (mFixedRotationLaunchingApp != null && r == null) {
mWmService.mDisplayNotificationController.dispatchFixedRotationFinished(this);
// Keep async rotation controller if the next transition of display is requested.
- if (!mTransitionController.isCollecting(this)) {
+ if (!mTransitionController.hasCollectingRotationChange(this, getRotation())) {
finishAsyncRotationIfPossible();
}
}
diff --git a/services/core/java/com/android/server/wm/TransitionController.java b/services/core/java/com/android/server/wm/TransitionController.java
index dfaa174..ae05725 100644
--- a/services/core/java/com/android/server/wm/TransitionController.java
+++ b/services/core/java/com/android/server/wm/TransitionController.java
@@ -578,6 +578,17 @@
}
/**
+ * Returns {@code true} if the window container is in the collecting transition, and its
+ * collected rotation is different from the target rotation.
+ */
+ boolean hasCollectingRotationChange(@NonNull WindowContainer<?> wc, int targetRotation) {
+ final Transition transition = mCollectingTransition;
+ if (transition == null || !transition.mParticipants.contains(wc)) return false;
+ final Transition.ChangeInfo changeInfo = transition.mChanges.get(wc);
+ return changeInfo != null && changeInfo.mRotation != targetRotation;
+ }
+
+ /**
* @see #requestTransitionIfNeeded(int, int, WindowContainer, WindowContainer, RemoteTransition)
*/
@Nullable
diff --git a/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java
index 5154d17..3ce10cf 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java
@@ -1244,6 +1244,27 @@
}
@Test
+ public void testFinishRotationControllerWithFixedRotation() {
+ final ActivityRecord app = new ActivityBuilder(mAtm).setCreateTask(true).build();
+ mDisplayContent.setFixedRotationLaunchingAppUnchecked(app);
+ registerTestTransitionPlayer();
+ mDisplayContent.setLastHasContent();
+ mDisplayContent.requestChangeTransitionIfNeeded(1 /* changes */, null /* displayChange */);
+ assertNotNull(mDisplayContent.getAsyncRotationController());
+ mDisplayContent.setFixedRotationLaunchingAppUnchecked(null);
+ assertNull("Clear rotation controller if rotation is not changed",
+ mDisplayContent.getAsyncRotationController());
+
+ mDisplayContent.setFixedRotationLaunchingAppUnchecked(app);
+ assertNotNull(mDisplayContent.getAsyncRotationController());
+ mDisplayContent.getDisplayRotation().setRotation(
+ mDisplayContent.getWindowConfiguration().getRotation() + 1);
+ mDisplayContent.setFixedRotationLaunchingAppUnchecked(null);
+ assertNotNull("Keep rotation controller if rotation will be changed",
+ mDisplayContent.getAsyncRotationController());
+ }
+
+ @Test
public void testDeferRotationForTransientLaunch() {
final TestTransitionPlayer player = registerTestTransitionPlayer();
assumeFalse(mDisplayContent.mTransitionController.useShellTransitionsRotation());