[Maps-SDK][Android] Fix benchmark tests Map leak (#14638)

GitOrigin-RevId: 11a8f121979939d7703fe235cf621c0f4ef6d206

Author: jush

maps-sdk/src/main/java/com/mapbox/maps/MapSurface.kt

@@ -90,6 +90,7 @@ class MapSurface : MapPluginProviderDelegate, MapControllable {
    * Must be called when the surface has been created.
    */
   fun surfaceCreated() {
+    logI(TAG, "surfaceCreated() called")
     renderer.surfaceCreated()
     // Set default refresh rate immediately to ensure map controller has a valid value
     mapController.setScreenRefreshRate(MapView.DEFAULT_FPS)
@@ -112,6 +113,8 @@ class MapSurface : MapPluginProviderDelegate, MapControllable {
       }
     }
 
+    // Stop any previous display refresh rate monitor in case `surfaceCreated` is called twice
+    stopDisplayRefreshRateMonitor()
     // Subscribe to live refresh-rate changes (VRR mode switches, per-UID frameRateOverride).
     displayRefreshRateMonitor = DisplayRefreshRateMonitor(
       context = context,
@@ -134,9 +137,14 @@ class MapSurface : MapPluginProviderDelegate, MapControllable {
    * Must be called when the surface is destroyed.
    */
   fun surfaceDestroyed() {
+    logI(TAG, "surfaceDestroyed() called")
+    stopDisplayRefreshRateMonitor()
+    renderer.surfaceDestroyed()
+  }
+
+  private fun stopDisplayRefreshRateMonitor() {
     displayRefreshRateMonitor?.stop()
     displayRefreshRateMonitor = null
-    renderer.surfaceDestroyed()
   }
 
   /**

maps-sdk/src/main/java/com/mapbox/maps/MapView.kt

@@ -239,6 +239,7 @@ open class MapView : FrameLayout, MapPluginProviderDelegate, MapControllable {
    * @see android.app.Fragment.onStart
    */
   override fun onStart() {
+    logI(TAG, "onStart() called")
     // Set default refresh rate immediately to ensure map controller has a valid value
     mapController.setScreenRefreshRate(DEFAULT_FPS)
     // Retrieve screen refresh rate off the main thread to prevent ANR
@@ -254,6 +255,8 @@ open class MapView : FrameLayout, MapPluginProviderDelegate, MapControllable {
       }
     }
 
+    // Stop any previous display refresh rate monitor in case `onStart` is called twice
+    stopDisplayRefreshRateMonitor()
     // Subscribe to live refresh-rate changes (VRR mode switches, per-UID frameRateOverride).
     displayRefreshRateMonitor = DisplayRefreshRateMonitor(
       context = context,
@@ -272,14 +275,19 @@ open class MapView : FrameLayout, MapPluginProviderDelegate, MapControllable {
    * @see android.app.Fragment.onStop
    */
   override fun onStop() {
-    displayRefreshRateMonitor?.stop()
-    displayRefreshRateMonitor = null
+    logI(TAG, "onStop() called")
+    stopDisplayRefreshRateMonitor()
     mapController.onStop()
     if (debugOptionsControllerDelegate.isInitialized()) {
       debugOptionsController.started = false
     }
   }
 
+  private fun stopDisplayRefreshRateMonitor() {
+    displayRefreshRateMonitor?.stop()
+    displayRefreshRateMonitor = null
+  }
+
   /**
    * You must call this method from the parent's Activity#onResume() or Fragment#onResume()
    * @see android.app.Activity.onResume