Commit b8dc5ab3 authored Mar 03, 2016 by Lajos Molnar Committed by android-build-merger Mar 03, 2016

Merge "media: correctly return cached size for MediaDataSource" into nyc-dev am: 64389e25

am: a840b0f2

* commit 'a840b0f2':
  media: correctly return cached size for MediaDataSource

media/jni/android_media_MediaDataSource.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,8 @@ status_t JMediaDataSource::getSize(off64_t* size) {
		return UNKNOWN_ERROR;
		}
		if (mSizeIsCached) {
		return mCachedSize;
		*size = mCachedSize;
		return OK;
		}

		JNIEnv* env = AndroidRuntime::getJNIEnv();