From 6116e5c0d894c3e5a32138b3ff1f50cbc80d304c Mon Sep 17 00:00:00 2001
From: Leon Scroggins III <scroggo@google.com>
Date: Mon, 3 May 2021 11:34:34 -0400
Subject: [PATCH] AImageDecoder: return BAD_PARAMETER on null info

Bug: 186656488
Test: I4dc406e85709dda14af8b414e2da3d39bb07643b
Change-Id: Ibd7c1c3d1319818e86ac29bdc231e0e05cec2132
---
 native/graphics/jni/imagedecoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/native/graphics/jni/imagedecoder.cpp b/native/graphics/jni/imagedecoder.cpp
index b0c8c612036a..a0f3098ad347 100644
--- a/native/graphics/jni/imagedecoder.cpp
+++ b/native/graphics/jni/imagedecoder.cpp
@@ -506,7 +506,7 @@ int AImageDecoder_getFrameInfo(AImageDecoder* decoder,
 }
 
 int64_t AImageDecoderFrameInfo_getDuration(const AImageDecoderFrameInfo* info) {
-    if (!info) return 0;
+    if (!info) return ANDROID_IMAGE_DECODER_BAD_PARAMETER;
 
     return toFrameInfo(info)->fDuration * 1'000'000;
 }