From 7c70373e2549ec1065dac07062e34dda8ff99291 Mon Sep 17 00:00:00 2001 From: Rob Carr Date: Tue, 27 Sep 2022 00:57:27 +0000 Subject: [PATCH] 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp index 1ebdc273931b8..795af8a58351e 100644 --- a/native/android/surface_control.cpp +++ b/native/android/surface_control.cpp @@ -300,7 +300,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(surfaceControl.get()); aSurfaceControlStats[aSurfaceControl].acquireTimeOrFence = acquireTimeOrFence; aSurfaceControlStats[aSurfaceControl].previousReleaseFence = previousReleaseFence; @@ -650,7 +650,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(surfaceControl.get());