DO NOT MERGE: Track SurfaceComposerClient changes am: df7c725586

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

Change-Id: I0850c5fcf5b93761d6a4f2998ea22afac7fa0d2e
This commit is contained in:
Robert Carr
2022-01-04 22:15:55 +00:00
committed by Automerger Merge Worker

View File

@@ -298,7 +298,7 @@ void ASurfaceTransaction_setOnComplete(ASurfaceTransaction* aSurfaceTransaction,
auto& aSurfaceControlStats = aSurfaceTransactionStats.aSurfaceControlStats; 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()); ASurfaceControl* aSurfaceControl = reinterpret_cast<ASurfaceControl*>(surfaceControl.get());
aSurfaceControlStats[aSurfaceControl].acquireTime = acquireTime; aSurfaceControlStats[aSurfaceControl].acquireTime = acquireTime;
aSurfaceControlStats[aSurfaceControl].previousReleaseFence = previousReleaseFence; aSurfaceControlStats[aSurfaceControl].previousReleaseFence = previousReleaseFence;
@@ -650,7 +650,7 @@ void ASurfaceTransaction_setOnCommit(ASurfaceTransaction* aSurfaceTransaction, v
for (const auto& for (const auto&
[surfaceControl, latchTime, acquireTime, presentFence, [surfaceControl, latchTime, acquireTime, presentFence,
previousReleaseFence, transformHint, previousReleaseFence, transformHint,
frameEvents] : surfaceControlStats) { frameEvents, ignore] : surfaceControlStats) {
ASurfaceControl* aSurfaceControl = ASurfaceControl* aSurfaceControl =
reinterpret_cast<ASurfaceControl*>(surfaceControl.get()); reinterpret_cast<ASurfaceControl*>(surfaceControl.get());
aSurfaceControlStats[aSurfaceControl].acquireTime = acquireTime; aSurfaceControlStats[aSurfaceControl].acquireTime = acquireTime;