diff options
| author | Haamed Gheibi <haamed@google.com> | 2022-03-09 12:05:14 -0800 |
|---|---|---|
| committer | Weijie Wang <quic_weijiew@quicinc.com> | 2022-03-15 15:38:25 +0800 |
| commit | 12bb6d3cbf05cea529a165917c7430af607056f2 (patch) | |
| tree | ff322630f9716306236ca70ecae1f265ae2aa2c6 /native/android/surface_control.cpp | |
| parent | a42412b7fc93a0eb852d8bf1a4d001f7df7f43b3 (diff) | |
Merge SP2A.220305.013
Bug: 220074017
Change-Id: Idfdd94e902f656ac65a2a75dfdd199f6f85ba472
Diffstat (limited to 'native/android/surface_control.cpp')
| -rw-r--r-- | native/android/surface_control.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp index 693a027bd0e2..d818ffc7c352 100644 --- a/native/android/surface_control.cpp +++ b/native/android/surface_control.cpp @@ -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; @@ -662,4 +662,4 @@ void ASurfaceTransaction_setOnCommit(ASurfaceTransaction* aSurfaceTransaction, v Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction); transaction->addTransactionCommittedCallback(callback, context); -}
\ No newline at end of file +} |