From f7c31bd3ef525571f69065e836e350f06ff8d81a Mon Sep 17 00:00:00 2001 From: jbibik Date: Wed, 9 Aug 2023 13:31:48 +0000 Subject: [PATCH] Fix Gradle Lint with @RequiresApi and SDK version Gradle Lint doesn't recognise `checkState` assertion and TargetApi should only ever be used for suppressing a bug in Android Lint. Hence, we keep @RequiresApi and add an if-statement explicitly. Also, fixes >26 to >=26 for the version check. #minor-release PiperOrigin-RevId: 555144577 --- .../androidx/media3/test/utils/TextureBitmapReader.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/TextureBitmapReader.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/TextureBitmapReader.java index 5896478d08..ec21a20a96 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/TextureBitmapReader.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/TextureBitmapReader.java @@ -16,17 +16,16 @@ package androidx.media3.test.utils; -import static androidx.media3.common.util.Assertions.checkState; import static androidx.media3.common.util.Assertions.checkStateNotNull; import android.graphics.Bitmap; +import android.os.Build; import android.view.Surface; import androidx.annotation.Nullable; import androidx.media3.common.GlTextureInfo; import androidx.media3.common.VideoFrameProcessingException; import androidx.media3.common.util.GlUtil; import androidx.media3.common.util.UnstableApi; -import androidx.media3.common.util.Util; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; @@ -40,7 +39,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; @UnstableApi public final class TextureBitmapReader implements VideoFrameProcessorTestRunner.BitmapReader { - // TODO(b/239172735): This outputs an incorrect black output image on emulators. private final Map outputTimestampsToBitmaps; private boolean useHighPrecisionColorComponents; private @MonotonicNonNull Bitmap outputBitmap; @@ -98,7 +96,9 @@ public final class TextureBitmapReader implements VideoFrameProcessorTestRunner. if (!useHighPrecisionColorComponents) { return BitmapPixelTestUtil.createArgb8888BitmapFromFocusedGlFramebuffer(width, height); } - checkState(Util.SDK_INT > 26, "useHighPrecisionColorComponents only supported on API 26+"); + if (Build.VERSION.SDK_INT < 26) { + throw new IllegalStateException("useHighPrecisionColorComponents only supported on API 26+"); + } return BitmapPixelTestUtil.createFp16BitmapFromFocusedGlFramebuffer(width, height); } }