Recycle bitmap after compression

Author: markushi

sentry-android-core/src/main/java/io/sentry/android/core/internal/util/ScreenshotUtils.java

@@ -164,6 +164,14 @@ public class ScreenshotUtils {
     return null;
   }
 
+  /**
+   * Compresses the supplied Bitmap to a PNG byte array. After compression, the Bitmap will be
+   * recycled.
+   *
+   * @param bitmap The bitmap to compress
+   * @param logger the logger
+   * @return the Bitmap in PNG format, or null if the bitmap was null, recycled or compressing faile
+   */
   public static @Nullable byte[] compressBitmapToPng(
       final @Nullable Bitmap bitmap, final @NotNull ILogger logger) {
     if (bitmap == null || bitmap.isRecycled()) {
@@ -173,6 +181,7 @@ public class ScreenshotUtils {
       // 0 meaning compress for small size, 100 meaning compress for max quality.
       // Some formats, like PNG which is lossless, will ignore the quality setting.
       bitmap.compress(Bitmap.CompressFormat.PNG, 0, byteArrayOutputStream);
+      bitmap.recycle();
 
       if (byteArrayOutputStream.size() <= 0) {
         logger.log(SentryLevel.DEBUG, "Screenshot is 0 bytes, not attaching the image.");

sentry-android-core/src/test/java/io/sentry/android/core/internal/util/ScreenshotUtilTest.kt

@@ -18,6 +18,7 @@ import org.robolectric.Robolectric.buildActivity
 import org.robolectric.annotation.Config
 import org.robolectric.shadows.ShadowPixelCopy
 import kotlin.test.Test
+import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
 
@@ -136,6 +137,14 @@ class ScreenshotUtilTest {
         assertNotNull(bytes)
         assertTrue(bytes.isNotEmpty())
     }
+
+    @Test
+    fun `compressBitmapToPng recycles the supplied bitmap`() {
+        val bitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888)
+        assertFalse(bitmap.isRecycled)
+        ScreenshotUtils.compressBitmapToPng(bitmap, NoOpLogger.getInstance())
+        assertTrue(bitmap.isRecycled)
+    }
 }
 
 class ExampleActivity : Activity() {