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

Commit 88fa8431 authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

Merge "surface_control NDK: Track frameworks/native changes" into tm-qpr-dev... 

Merge "surface_control NDK: Track frameworks/native changes" into tm-qpr-dev am: 1d3ecebe am: 9f4876b6

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



Change-Id: I31c393482d6f285809d033a168f57cef07993697
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f48bbc63 9f4876b6

native/android/surface_control.cpp

+2 −2
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ void ASurfaceTransaction_setOnComplete(ASurfaceTransaction* aSurfaceTransaction, 
        auto& aSurfaceControlStats = aSurfaceTransactionStats.aSurfaceControlStats;



        for (const auto& [surfaceControl, latchTime, acquireTimeOrFence, presentFence,

                          previousReleaseFence, transformHint, frameEvents] : surfaceControlStats) {

                  previousReleaseFence, transformHint, frameEvents, ignore] : surfaceControlStats) {

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

            aSurfaceControlStats[aSurfaceControl].acquireTimeOrFence = acquireTimeOrFence;

            aSurfaceControlStats[aSurfaceControl].previousReleaseFence = previousReleaseFence;
@@ -671,7 +671,7 @@ void ASurfaceTransaction_setOnCommit(ASurfaceTransaction* aSurfaceTransaction, v 


                auto& aSurfaceControlStats = aSurfaceTransactionStats.aSurfaceControlStats;

                for (const auto& [surfaceControl, latchTime, acquireTimeOrFence, presentFence,

                                  previousReleaseFence, transformHint, frameEvents] :

                              previousReleaseFence, transformHint, frameEvents, ignore] :

                     surfaceControlStats) {

                    ASurfaceControl* aSurfaceControl =

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