From 14b28ce9cec2c88fededf0f20aff0f8ed2c8a9e8 Mon Sep 17 00:00:00 2001
From: Pablo Gamito <pablogamito@google.com>
Date: Mon, 6 Sep 2021 16:33:23 +0000
Subject: Get rid of unused ASurfaceControl in frame metrics listener callback

Test: Existing tests
Change-Id: Ia071814dabfc762d00d3324bfaa343ff94ab8338
---
 libs/hwui/renderthread/CanvasContext.cpp | 4 ++--
 libs/hwui/renderthread/CanvasContext.h   | 4 ++--
 native/android/surface_control.cpp       | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index aa39d55adc36..b11e722ea2e3 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<CanvasContext*>(context);
 
     const ASurfaceControlFunctions& functions =
diff --git a/libs/hwui/renderthread/CanvasContext.h b/libs/hwui/renderthread/CanvasContext.h
index ec91e662fcd3..8d9750dd2ca6 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<bool(int64_t, int64_t, int64_t)>& callback) {
diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp
index 31350ee9894f..7f74dd4c33c3 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<Fence>&,
-                                                        const SurfaceStats& surfaceStats) {
+    SurfaceStatsCallback callback = [func, id](void* callback_context, nsecs_t, const sp<Fence>&,
+                                               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,
-- 
cgit v1.2.3-59-g8ed1b