commit 88fa84315b8ad582b90011e512917709a050adad
author Rob Carr <racarr@google.com> Fri Sep 30 18:05:08 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 30 18:05:08 2022 +0000
tree 36740e255452d9923a34e3771c5d299b8ddd7741
parent f48bbc6357650f3552f0c50712b09ed0c26cc1f5
parent 9f4876b6a613d2bb7528c955535d1bb4a8c0d263

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

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

Change-Id: I31c393482d6f285809d033a168f57cef07993697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

native/android/surface_control.cpp

diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp
index 9e4d726..21d4d80 100644
--- a/native/android/surface_control.cpp
+++ b/native/android/surface_control.cpp
@@ -311,7 +311,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;
@@ -671,7 +671,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());