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

2016-03-03 16:05:52 +00:00
parent 60cdc23913 7c7fef1585
commit 64389e25ba
1 changed files with 2 additions and 1 deletions
--- a/media/jni/android_media_MediaDataSource.cpp
+++ b/media/jni/android_media_MediaDataSource.cpp
@@ -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();