Synchronize bitmap modifications

Requires to use synchronized blocks over AutoClosableReentrantLock, as
only the bitmap object is shared across Strategy <-> ReplayCache.
This ensure bitmap.compress is not called in parallel to bitmap.recycle

Author: markushi

sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayCache.kt

@@ -79,12 +79,16 @@ public class ReplayCache(private val options: SentryOptions, private val replayI
     replayCacheDir?.mkdirs()
 
     val screenshot = File(replayCacheDir, "$frameTimestamp.jpg").also { it.createNewFile() }
-    screenshot.outputStream().use {
-      bitmap.compress(JPEG, options.sessionReplay.quality.screenshotQuality, it)
-      it.flush()
+    synchronized(bitmap) {
+      if (bitmap.isRecycled) {
+        return
+      }
+      screenshot.outputStream().use {
+        bitmap.compress(JPEG, options.sessionReplay.quality.screenshotQuality, it)
+        it.flush()
+      }
+      addFrame(screenshot, frameTimestamp, screen)
     }
-
-    addFrame(screenshot, frameTimestamp, screen)
   }
 
   /**

sentry-android-replay/src/main/java/io/sentry/android/replay/screenshot/CanvasStrategy.kt

@@ -52,6 +52,7 @@ internal class CanvasStrategy(
 
   @Volatile private var screenshot: Bitmap? = null
 
+  // Lock to synchronize screenshot creation
   private val screenshotLock = AutoClosableReentrantLock()
   private val prescaledMatrix by
     lazy(NONE) { Matrix().apply { preScale(config.scaleFactorX, config.scaleFactorY) } }
@@ -71,18 +72,23 @@ internal class CanvasStrategy(
           if (image.planes.size > 0) {
             val plane = image.planes[0]
 
-            screenshotLock.acquire().use {
-              if (screenshot == null) {
-                screenshot =
-                  Bitmap.createBitmap(holder.width, holder.height, Bitmap.Config.ARGB_8888)
-              }
-              val bitmap = screenshot
-              if (bitmap == null || bitmap.isRecycled) {
-                return@use
+            if (screenshot == null) {
+              screenshotLock.acquire().use {
+                if (screenshot == null) {
+                  screenshot =
+                    Bitmap.createBitmap(holder.width, holder.height, Bitmap.Config.ARGB_8888)
+                }
               }
+            }
 
+            val bitmap = screenshot
+            if (bitmap != null) {
               val buffer = plane.buffer.rewind()
-              bitmap.copyPixelsFromBuffer(buffer)
+              synchronized(bitmap) {
+                if (!bitmap.isRecycled) {
+                  bitmap.copyPixelsFromBuffer(buffer)
+                }
+              }
               lastCaptureSuccessful.set(true)
               screenshotRecorderCallback?.onScreenshotRecorded(bitmap)
             }
@@ -183,14 +189,15 @@ internal class CanvasStrategy(
 
   override fun close() {
     isClosed.set(true)
-    screenshotLock.acquire().use {
-      screenshot?.apply {
-        if (!isRecycled) {
-          recycle()
+    screenshot?.let {
+      synchronized(it) {
+        if (!it.isRecycled) {
+          it.recycle()
         }
       }
-      screenshot = null
     }
+    screenshot = null
+
     // the image can be free, unprocessed or in transit
     freePictureRef.getAndSet(null)?.reader?.close()
     unprocessedPictureRef.getAndSet(null)?.reader?.close()

sentry-android-replay/src/main/java/io/sentry/android/replay/screenshot/PixelCopyStrategy.kt

@@ -166,7 +166,7 @@ internal class PixelCopyStrategy(
 
   override fun close() {
     if (!screenshot.isRecycled) {
-      screenshot.recycle()
+      synchronized(screenshot) { screenshot.recycle() }
     }
   }