commit 14b28ce9cec2c88fededf0f20aff0f8ed2c8a9e8
author Pablo Gamito <pablogamito@google.com> Mon Sep 06 16:33:23 2021 +0000
committer Pablo Gamito <pablogamito@google.com> Tue Sep 07 16:47:25 2021 +0000
tree f7df647f01978da46890816b800d860c8ff6ca6a
parent 7e6a5f29f59e732f3172439ae8417970fe229d42

Get rid of unused ASurfaceControl in frame metrics listener callback

Test: Existing tests
Change-Id: Ia071814dabfc762d00d3324bfaa343ff94ab8338

libs/hwui/renderthread/CanvasContext.cpp

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index aa39d55..b11e722 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -731,8 +731,8 @@
     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 =

libs/hwui/renderthread/CanvasContext.h

diff --git a/libs/hwui/renderthread/CanvasContext.h b/libs/hwui/renderthread/CanvasContext.h
index ec91e66..8d9750d 100644
--- a/libs/hwui/renderthread/CanvasContext.h
+++ b/libs/hwui/renderthread/CanvasContext.h
@@ -196,8 +196,8 @@
     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) {

native/android/surface_control.cpp

diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp
index 31350ee..7f74dd4 100644
--- a/native/android/surface_control.cpp
+++ b/native/android/surface_control.cpp
@@ -149,16 +149,15 @@
 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,