replay: avoid initializing singlePixelBitmap in MaskRenderer.close(); recycle only if initialized and used. Update unit test to initialize via ImageView masking path before asserting recycling.

cursoragent · cursoragent · commit a91a35fcca01 · 2026-02-25T13:07:37.000Z
diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/util/MaskRenderer.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/util/MaskRenderer.kt
@@ -26,8 +26,10 @@ internal class MaskRenderer : Closeable {
   }
 
   // Single pixel bitmap for dominant color sampling (averaging the region)
-  internal val singlePixelBitmap: Bitmap by
+  private val singlePixelBitmapLazy by lazy(NONE) {
     lazy(NONE) { Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888) }
+  }
+  internal val singlePixelBitmap: Bitmap by singlePixelBitmapLazy
   private val singlePixelBitmapCanvas: Canvas by lazy(NONE) { Canvas(singlePixelBitmap) }
   private val maskingPaint by lazy(NONE) { Paint() }
 
@@ -110,8 +112,10 @@ internal class MaskRenderer : Closeable {
 
   /** Releases resources. Call when done with this renderer. */
   override fun close() {
-    if (!singlePixelBitmap.isRecycled) {
-      singlePixelBitmap.recycle()
+    if (singlePixelBitmapLazy.isInitialized()) {
+      if (!singlePixelBitmap.isRecycled) {
+        singlePixelBitmap.recycle()
+      }
     }
   }
 }
diff --git a/sentry-android-replay/src/test/java/io/sentry/android/replay/util/MaskRendererTest.kt b/sentry-android-replay/src/test/java/io/sentry/android/replay/util/MaskRendererTest.kt
@@ -317,21 +317,22 @@ class MaskRendererTest {
   @Test
   fun `close recycles internal bitmap`() {
     val renderer = MaskRenderer()
-    // Trigger lazy initialization by calling renderMasks
+    // Ensure lazy bitmap is initialized by masking an ImageView node (dominant color path)
     val bitmap = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888)
-    val node =
-      GenericViewHierarchyNode(
+    bitmap.eraseColor(Color.GREEN)
+    val imageNode =
+      ImageViewHierarchyNode(
         x = 0f,
         y = 0f,
         width = 10,
         height = 10,
         elevation = 0f,
         distance = 0,
-        shouldMask = false,
+        shouldMask = true,
         isVisible = true,
         visibleRect = Rect(0, 0, 10, 10),
       )
-    renderer.renderMasks(bitmap, node, null)
+    renderer.renderMasks(bitmap, imageNode, null)
 
     renderer.close()
     assertTrue(renderer.singlePixelBitmap.isRecycled)

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,10 @@ internal class MaskRenderer : Closeable {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// Single pixel bitmap for dominant color sampling (averaging the region)`
`29`		`- internal val singlePixelBitmap: Bitmap by`
	`29`	`+ private val singlePixelBitmapLazy by lazy(NONE) {`
`30`	`30`	`lazy(NONE) { Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888) }`
	`31`	`+ }`
	`32`	`+ internal val singlePixelBitmap: Bitmap by singlePixelBitmapLazy`
`31`	`33`	`private val singlePixelBitmapCanvas: Canvas by lazy(NONE) { Canvas(singlePixelBitmap) }`
`32`	`34`	`private val maskingPaint by lazy(NONE) { Paint() }`
`33`	`35`
`@@ -110,8 +112,10 @@ internal class MaskRenderer : Closeable {`
`110`	`112`
`111`	`113`	`/** Releases resources. Call when done with this renderer. */`
`112`	`114`	`override fun close() {`
`113`		`- if (!singlePixelBitmap.isRecycled) {`
`114`		`- singlePixelBitmap.recycle()`
	`115`	`+ if (singlePixelBitmapLazy.isInitialized()) {`
	`116`	`+ if (!singlePixelBitmap.isRecycled) {`
	`117`	`+ singlePixelBitmap.recycle()`
	`118`	`+ }`
`115`	`119`	`}`
`116`	`120`	`}`
`117`	`121`	`}`