From b0dc76e82e307ff2d1fa0c69aae631f9fdd0bbde Mon Sep 17 00:00:00 2001 From: Artem Kholodnyi Date: Sat, 14 Oct 2023 08:34:18 -0700 Subject: [PATCH] Make it explicit that config can be null in DecodeProducer Reviewed By: oprisnik Differential Revision: D50224676 fbshipit-source-id: ab2ad9128356dd32d6b11e1979f5dd362c91b1d4 --- .../com/facebook/imagepipeline/producers/DecodeProducer.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/DecodeProducer.kt b/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/DecodeProducer.kt index 822afa701e..0caf698c72 100644 --- a/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/DecodeProducer.kt +++ b/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/DecodeProducer.kt @@ -7,6 +7,7 @@ package com.facebook.imagepipeline.producers +import android.graphics.Bitmap import com.facebook.common.internal.ImmutableMap import com.facebook.common.internal.Supplier import com.facebook.common.logging.FLog @@ -277,8 +278,8 @@ class DecodeProducer( producerContext.putExtra(HasExtraData.KEY_ENCODED_SIZE, encodedImage.size) producerContext.putExtra(HasExtraData.KEY_COLOR_SPACE, encodedImage.colorSpace) if (image is CloseableBitmap) { - val bitmap = image.underlyingBitmap - val config = if (bitmap == null) null else bitmap.config + @Suppress("RedundantNullableReturnType") + val config: Bitmap.Config? = image.underlyingBitmap.config producerContext.putExtra(HasExtraData.KEY_BITMAP_CONFIG, config.toString()) } image?.putExtras(producerContext.getExtras())