commit 7c70373e2549ec1065dac07062e34dda8ff99291
author Rob Carr <racarr@google.com> Tue Sep 27 00:57:27 2022 +0000
committer Rob Carr <racarr@google.com> Tue Sep 27 01:00:08 2022 +0000
tree e6e7c9a25e366431880fe16c5e3f3a4fc1328fd7
parent df2bdd51358e353bd4a261cc3fb8b260c2f83237

surface_control NDK: Track frameworks/native changes

A BBQ changes requires adding an additional member to
SurfaceControlStats which requires updating this destructuring
assignment.

Bug: 247246160
Test: Existing tests pass
Change-Id: Ic485fe3ae97c4243ab9993717c674c66b28c7fee

native/android/surface_control.cpp

diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp
index 1ebdc27..795af8a 100644
--- a/native/android/surface_control.cpp
+++ b/native/android/surface_control.cpp
@@ -300,7 +300,7 @@
         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;
@@ -650,7 +650,7 @@
 
                 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());