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

Commit 74e9c52a authored by Robert Carr's avatar Robert Carr Committed by Automerger Merge Worker
Browse files

DO NOT MERGE: Track SurfaceComposerClient changes am: df7c7255 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16556224

Change-Id: I0850c5fcf5b93761d6a4f2998ea22afac7fa0d2e
parents 7839a19f 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;