Merge "Remove enabled flag remove_starting_window_wait_for_multi_transitions" into main (848ed09b) · Commits · e / os / android_frameworks_base

core/java/android/window/flags/windowing_frontend.aconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -302,17 +302,6 @@ flag {
		}
		}

		flag {
		name: "remove_starting_window_wait_for_multi_transitions"
		namespace: "windowing_frontend"
		description: "Avoid remove starting window too early when playing multiple transitions"
		bug: "362347290"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "ensure_keyguard_does_transition_starting"
		namespace: "windowing_frontend"

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

+2 −20

Original line number	Diff line number	Diff line
		@@ -2668,11 +2668,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}
		// Only do transfer after transaction has done when starting window exist.
		if (mStartingData != null) {
		final boolean isWaitingForSyncTransactionCommit =
		Flags.removeStartingWindowWaitForMultiTransitions()
		? getSyncTransactionCommitCallbackDepth() > 0
		: mStartingData.mWaitForSyncTransactionCommit;
		if (isWaitingForSyncTransactionCommit) {
		if (getSyncTransactionCommitCallbackDepth() > 0) {
		mStartingData.mRemoveAfterTransaction = AFTER_TRANSACTION_COPY_TO_CLIENT;
		return true;
		}
		@@ -2834,14 +2830,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}
		}

		@Override
		void waitForSyncTransactionCommit(ArraySet<WindowContainer> wcAwaitingCommit) {
		super.waitForSyncTransactionCommit(wcAwaitingCommit);
		if (mStartingData != null) {
		mStartingData.mWaitForSyncTransactionCommit = true;
		}
		}

		@Override
		void onSyncTransactionCommitted(SurfaceControl.Transaction t) {
		super.onSyncTransactionCommitted(t);
		@@ -2849,7 +2837,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		return;
		}
		final StartingData lastData = mStartingData;
		lastData.mWaitForSyncTransactionCommit = false;
		if (lastData.mRemoveAfterTransaction == AFTER_TRANSACTION_REMOVE_DIRECTLY) {
		removeStartingWindowAnimation(lastData.mPrepareRemoveAnimation);
		} else if (lastData.mRemoveAfterTransaction == AFTER_TRANSACTION_COPY_TO_CLIENT) {
		@@ -2879,12 +2866,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		final boolean animate;
		final boolean hasImeSurface;
		if (mStartingData != null) {
		final boolean isWaitingForSyncTransactionCommit =
		Flags.removeStartingWindowWaitForMultiTransitions()
		? getSyncTransactionCommitCallbackDepth() > 0
		: mStartingData.mWaitForSyncTransactionCommit;
		if (isWaitingForSyncTransactionCommit
		\|\| mSyncState != SYNC_STATE_NONE) {
		if (getSyncTransactionCommitCallbackDepth() > 0 \|\| mSyncState != SYNC_STATE_NONE) {
		mStartingData.mRemoveAfterTransaction = AFTER_TRANSACTION_REMOVE_DIRECTLY;
		mStartingData.mPrepareRemoveAnimation = prepareAnimation;
		return;

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

+0 −13

Original line number	Diff line number	Diff line
		@@ -61,18 +61,6 @@ public abstract class StartingData {
		/** Whether the starting window is drawn. */
		boolean mIsDisplayed;

		/**
		* For Shell transition.
		* There will be a transition happen on attached activity, do not remove starting window during
		* this period, because the transaction to show app window may not apply before remove starting
		* window.
		* Note this isn't equal to transition playing, the period should be
		* Sync finishNow -> Start transaction apply.
		* @deprecated TODO(b/362347290): cleanup after fix ramp up
		*/
		@Deprecated
		boolean mWaitForSyncTransactionCommit;

		/**
		* For Shell transition.
		* This starting window should be removed after applying the start transaction of transition,
		@@ -114,7 +102,6 @@ public abstract class StartingData {
		public String toString() {
		return getClass().getSimpleName() + "{"
		+ Integer.toHexString(System.identityHashCode(this))
		+ " waitForSyncTransactionCommit=" + mWaitForSyncTransactionCommit
		+ " removeAfterTransaction= " + mRemoveAfterTransaction
		+ "}";
		}