diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index aa39d55adc36f..b11e722ea2e38 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -731,8 +731,8 @@ FrameInfo* CanvasContext::getFrameInfoFromLast4(uint64_t frameNumber, uint32_t s return nullptr; } -void CanvasContext::onSurfaceStatsAvailable(void* context, ASurfaceControl* control, - int32_t surfaceControlId, ASurfaceControlStats* stats) { +void CanvasContext::onSurfaceStatsAvailable(void* context, int32_t surfaceControlId, + ASurfaceControlStats* stats) { auto* instance = static_cast(context); const ASurfaceControlFunctions& functions = diff --git a/libs/hwui/renderthread/CanvasContext.h b/libs/hwui/renderthread/CanvasContext.h index ec91e662fcd3c..8d9750dd2ca62 100644 --- a/libs/hwui/renderthread/CanvasContext.h +++ b/libs/hwui/renderthread/CanvasContext.h @@ -196,8 +196,8 @@ public: SkISize getNextFrameSize() const; // Called when SurfaceStats are available. - static void onSurfaceStatsAvailable(void* context, ASurfaceControl* control, - int32_t surfaceControlId, ASurfaceControlStats* stats); + static void onSurfaceStatsAvailable(void* context, int32_t surfaceControlId, + ASurfaceControlStats* stats); void setASurfaceTransactionCallback( const std::function& callback) { diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp index 31350ee9894fc..7f74dd4c33c31 100644 --- a/native/android/surface_control.cpp +++ b/native/android/surface_control.cpp @@ -149,16 +149,15 @@ struct ASurfaceControlStats { void ASurfaceControl_registerSurfaceStatsListener(ASurfaceControl* control, int32_t id, void* context, ASurfaceControl_SurfaceStatsListener func) { - SurfaceStatsCallback callback = [func, control, id](void* callback_context, nsecs_t, - const sp&, - const SurfaceStats& surfaceStats) { + SurfaceStatsCallback callback = [func, id](void* callback_context, nsecs_t, const sp&, + const SurfaceStats& surfaceStats) { ASurfaceControlStats aSurfaceControlStats; aSurfaceControlStats.acquireTime = surfaceStats.acquireTime; aSurfaceControlStats.previousReleaseFence = surfaceStats.previousReleaseFence; aSurfaceControlStats.frameNumber = surfaceStats.eventStats.frameNumber; - (*func)(callback_context, control, id, &aSurfaceControlStats); + (*func)(callback_context, id, &aSurfaceControlStats); }; TransactionCompletedListener::getInstance()->addSurfaceStatsListener(context,