Merge "Cleanup use_self_sync_transaction_for_layer" into main (c8f5b457) · Commits · e / os / android_frameworks_base

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

+0 −11

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

		flag {
		namespace: "windowing_sdk"
		name: "use_self_sync_transaction_for_layer"
		description: "Always use this.getSyncTransaction for assignLayer"
		bug: "388127825"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "windowing_sdk"
		name: "safe_region_letterboxing"

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -97,7 +97,6 @@ import com.android.server.wm.SurfaceAnimator.Animatable;
		import com.android.server.wm.SurfaceAnimator.AnimationType;
		import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback;
		import com.android.server.wm.utils.AlwaysTruePredicate;
		import com.android.window.flags.Flags;

		import java.io.PrintWriter;
		import java.lang.ref.WeakReference;
		@@ -2630,7 +2629,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
		if (!mTransitionController.canAssignLayers(this)) return;
		final boolean changed = layer != mLastLayer \|\| mLastRelativeToLayer != null;
		if (mSurfaceControl != null && changed) {
		if (Flags.useSelfSyncTransactionForLayer() && mSyncState != SYNC_STATE_NONE) {
		if (mSyncState != SYNC_STATE_NONE) {
		// When this container needs to be synced, assign layer with its own sync
		// transaction to avoid out of ordering when merge.
		// Still use the passed-in transaction for non-sync case, such as building finish
		@@ -2647,7 +2646,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
		boolean forceUpdate) {
		final boolean changed = layer != mLastLayer \|\| mLastRelativeToLayer != relativeTo;
		if (mSurfaceControl != null && (changed \|\| forceUpdate)) {
		if (Flags.useSelfSyncTransactionForLayer() && mSyncState != SYNC_STATE_NONE) {
		if (mSyncState != SYNC_STATE_NONE) {
		// When this container needs to be synced, assign layer with its own sync
		// transaction to avoid out of ordering when merge.
		// Still use the passed-in transaction for non-sync case, such as building finish

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -5447,7 +5447,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		@Override
		void assignLayer(Transaction t, int layer) {
		if (mStartingData != null) {
		if (Flags.useSelfSyncTransactionForLayer() && mSyncState != SYNC_STATE_NONE) {
		if (mSyncState != SYNC_STATE_NONE) {
		// When this container needs to be synced, assign layer with its own sync
		// transaction to avoid out of ordering when merge.
		// Still use the passed-in transaction for non-sync case, such as building finish