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

Commit 87d467c7 authored by Chris Li's avatar Chris Li
Browse files

Cleanup use_self_sync_transaction_for_layer 

Fix: 388127825
Test: flag cleanup only
Flag: EXEMPT flag cleanup
Change-Id: I4dec6bcb0b7acfe004a4525178dfbf2a511624cc
parent 17562cc7

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

+0 −11
Original line number Diff line number Diff line
@@ -125,17 +125,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