Skip to content

Fix potential bitmap leaks in FrameTimingsObserver #55652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
huntie wants to merge 1 commit into from
+12 −8
Closed

Fix potential bitmap leaks in FrameTimingsObserver #55652

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions ...eactAndroid/src/main/java/com/facebook/react/devsupport/inspector/FrameTimingsObserver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ internal class FrameTimingsObserver(
if (it.width == width && it.height == height) {
it
} else {
it.recycle()
null
}
} ?: Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888).also { bitmapBuffer = it }
Expand All @@ -83,26 +84,29 @@ internal class FrameTimingsObserver(
{ copyResult ->
if (copyResult == PixelCopy.SUCCESS) {
CoroutineScope(Dispatchers.Default).launch {
var scaledBitmap: Bitmap? = null
try {
val scaleFactor = 0.25f
val scaledWidth = (width * scaleFactor).toInt()
val scaledHeight = (height * scaleFactor).toInt()
val scaledBitmap =
Bitmap.createScaledBitmap(bitmap, scaledWidth, scaledHeight, true)
scaledBitmap = Bitmap.createScaledBitmap(bitmap, scaledWidth, scaledHeight, true)

val outputStream = ByteArrayOutputStream()
val compressFormat =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
Bitmap.CompressFormat.WEBP_LOSSY
else Bitmap.CompressFormat.WEBP
scaledBitmap.compress(compressFormat, 0, outputStream)
val bytes = outputStream.toByteArray()
val base64 = Base64.encodeToString(bytes, Base64.NO_WRAP)
continuation.resume(base64)

scaledBitmap.recycle()
val base64 =
ByteArrayOutputStream().use { outputStream ->
scaledBitmap.compress(compressFormat, 0, outputStream)
Base64.encodeToString(outputStream.toByteArray(), Base64.NO_WRAP)
}

continuation.resume(base64)
} catch (e: Exception) {
continuation.resume(null)
} finally {
scaledBitmap?.recycle()
}
}
} else {
Expand Down
Loading