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

Commit 39bfc78f authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Track SurfaceComposerClient changes" into sc-v2-dev

parents 238c6d65 df7c7255

native/android/surface_control.cpp

+3 −3
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ void ASurfaceTransaction_setOnComplete(ASurfaceTransaction* aSurfaceTransaction, 


        auto& aSurfaceControlStats = aSurfaceTransactionStats.aSurfaceControlStats;



        for (const auto& [surfaceControl, latchTime, acquireTime, presentFence, previousReleaseFence, transformHint, frameEvents] : surfaceControlStats) {

        for (const auto& [surfaceControl, latchTime, acquireTime, presentFence, previousReleaseFence, transformHint, frameEvents, ignore] : surfaceControlStats) {

            ASurfaceControl* aSurfaceControl = reinterpret_cast<ASurfaceControl*>(surfaceControl.get());

            aSurfaceControlStats[aSurfaceControl].acquireTime = acquireTime;

            aSurfaceControlStats[aSurfaceControl].previousReleaseFence = previousReleaseFence;
@@ -650,7 +650,7 @@ void ASurfaceTransaction_setOnCommit(ASurfaceTransaction* aSurfaceTransaction, v 
                for (const auto&

                             [surfaceControl, latchTime, acquireTime, presentFence,

                              previousReleaseFence, transformHint,

                              frameEvents] : surfaceControlStats) {

                              frameEvents, ignore] : surfaceControlStats) {

                    ASurfaceControl* aSurfaceControl =

                            reinterpret_cast<ASurfaceControl*>(surfaceControl.get());

                    aSurfaceControlStats[aSurfaceControl].acquireTime = acquireTime;