Commit 6b524bce authored May 06, 2021 by Leon Scroggins Committed by Automerger Merge Worker May 06, 2021

Merge "AImageDecoder: return BAD_PARAMETER on null info" into sc-dev am: ee8da6bd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14411443

Change-Id: Idf6b064f1edabb76d3f549ff9654855fbb17b372

parents 30879a0e ee8da6bd

native/graphics/jni/imagedecoder.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}