Merge "ExifInterface: Set mPosition in AssetStream with proper values" into nyc-dev (a7ad6e91) · Commits · e / os / android_frameworks_base

media/jni/android_media_Utils.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@
	namespace android {		namespace android {

	AssetStream::AssetStream(SkStream* stream)		AssetStream::AssetStream(SkStream* stream)
	: mStream(stream) {		: mStream(stream), mPosition(0) {
	}		}

	AssetStream::~AssetStream() {		AssetStream::~AssetStream() {
	@@ -48,7 +48,7 @@ piex::Error AssetStream::GetData(

	// Read bytes.		// Read bytes.
	size_t size = mStream->read((void*)data, length);		size_t size = mStream->read((void*)data, length);
	mPosition += size;		mPosition = offset + size;

	return size == length ? piex::Error::kOk : piex::Error::kFail;		return size == length ? piex::Error::kOk : piex::Error::kFail;
	}		}