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

Commit e0e1239f authored Sep 25, 2023 by Wei Sheng Shih Committed by Automerger Merge Worker Sep 25, 2023

Merge "Only defer remove starting window if the collecting target below task"...

Merge "Only defer remove starting window if the collecting target below task" into udc-qpr-dev am: 19ae03e5 am: 71d325d5

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

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

parents 4ae6168a 71d325d5

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2887,7 +2887,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		final boolean animate;
		if (mStartingData != null) {
		if (mStartingData.mWaitForSyncTransactionCommit
		\|\| mTransitionController.inCollectingTransition(startingWindow)) {
		\|\| mTransitionController.isCollecting(this)) {
		mStartingData.mRemoveAfterTransaction = AFTER_TRANSACTION_REMOVE_DIRECTLY;
		mStartingData.mPrepareRemoveAnimation = prepareAnimation;
		return;

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -108,4 +108,13 @@ public abstract class StartingData {
		boolean hasImeSurface() {
		return false;
		}

		@Override
		public String toString() {
		return getClass().getSimpleName() + "{"
		+ Integer.toHexString(System.identityHashCode(this))
		+ " waitForSyncTransactionCommit=" + mWaitForSyncTransactionCommit
		+ " removeAfterTransaction= " + mRemoveAfterTransaction
		+ "}";
		}
		}