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

Commit fb9803ba authored Mar 24, 2023 by Riddle Hsu Committed by Automerger Merge Worker Mar 24, 2023

Merge "Do not wait for transient hide transition targets" into udc-dev am: 4995fd3e

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

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

parents 33bf24ed 4995fd3e

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

+5 −0

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

		@Override
		boolean isSyncFinished() {
		if (task != null && mTransitionController.isTransientHide(task)) {
		// The activity keeps visibleRequested but may be hidden later, so no need to wait for
		// it to be drawn.
		return true;
		}
		if (!super.isSyncFinished()) return false;
		if (mDisplayContent != null && mDisplayContent.mUnknownAppVisibilityController
		.isVisibilityUnknown(this)) {

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1415,6 +1415,8 @@ public class TransitionTests extends WindowTestsBase {
		final Transition.ChangeInfo activity1ChangeInfo = closeTransition.mChanges.get(activity1);
		assertNotNull(activity1ChangeInfo);
		assertTrue(activity1ChangeInfo.hasChanged());
		// No need to wait for the activity in transient hide task.
		assertTrue(activity1.isSyncFinished());

		activity1.setVisibleRequested(false);
		activity2.setVisibleRequested(true);