Commit 2893d912 authored Jun 11, 2020 by Treehugger Robot Committed by Automerger Merge Worker Jun 11, 2020

Merge "Fix typo in log message" am: b5399e42 am: 36362456 am: 29f9048d...

Merge "Fix typo in log message" am: b5399e42 am: 36362456 am: 29f9048d am: d69ce442 am: 7e392635

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1324308

Change-Id: I02b63a8625fe12229446c58faa16d79398a08c6b

media/libstagefright/flac/dec/FLACDecoder.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -433,7 +433,7 @@ status_t FLACDecoder::addDataToBuffer(const uint8_t *inBuffer, size_t inBufferLe
		if (mBuffer == nullptr) {
		mBufferDataSize = 0;
		mBufferLen = 0;
		ALOGE("decodeOneFrame: failed to allocate memory for input buffer");
		ALOGE("addDataToBuffer: failed to allocate memory for input buffer");
		return NO_MEMORY;
		}
		mBufferLen = mBufferDataSize + inBufferLen;