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

Commit 5b719d63 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Guard Choreographer buffer stuffing recovery behind flag" into main

parents e935d45e 77fb584c
Loading
Loading
Loading
Loading
+19 −16
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@

package android.view;

import static android.view.flags.Flags.bufferStuffingRecovery;
import static android.view.flags.Flags.FLAG_EXPECTED_PRESENTATION_TIME_API;
import static android.view.DisplayEventReceiver.VSYNC_SOURCE_APP;
import static android.view.DisplayEventReceiver.VSYNC_SOURCE_SURFACE_FLINGER;
@@ -965,6 +966,7 @@ public final class Choreographer {

        // Evaluate if buffer stuffing recovery needs to start or end, and
        // what actions need to be taken for recovery.
        if (bufferStuffingRecovery()) {
            switch (updateBufferStuffingState(frameTimeNanos, vsyncEventData)) {
                case NONE:
                    // Without buffer stuffing recovery, offsetFrameTimeNanos is
@@ -982,6 +984,7 @@ public final class Choreographer {
                default:
                    break;
            }
        }

        try {
            FrameTimeline timeline = mFrameData.update(offsetFrameTimeNanos, vsyncEventData);
+3 −6
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static android.graphics.Matrix.MSKEW_X;
import static android.graphics.Matrix.MSKEW_Y;
import static android.graphics.Matrix.MTRANS_X;
import static android.graphics.Matrix.MTRANS_Y;
import static android.view.flags.Flags.bufferStuffingRecovery;
import static android.view.SurfaceControlProto.HASH_CODE;
import static android.view.SurfaceControlProto.LAYER_ID;
import static android.view.SurfaceControlProto.NAME;
@@ -5118,11 +5117,9 @@ public final class SurfaceControl implements Parcelable {
         */
        @NonNull
        public Transaction setRecoverableFromBufferStuffing(@NonNull SurfaceControl sc) {
            if (bufferStuffingRecovery()) {
            checkPreconditions(sc);
            nativeSetFlags(mNativeObject, sc.mNativeObject, RECOVERABLE_FROM_BUFFER_STUFFING,
                    RECOVERABLE_FROM_BUFFER_STUFFING);
            }
            return this;
        }