From ea38886d589a19676b528ccbf45ef8d240323bfb Mon Sep 17 00:00:00 2001
From: Robert Shih <robertshih@google.com>
Date: Tue, 20 Nov 2018 02:11:30 -0800
Subject: [PATCH] NdkMediaDataSource: fix getAvailableSize

Bug: 119127316
Test: NativeDecoderTest#testExtractorCachedDurationNative
Change-Id: I92b751f23d2598ea6c46ab79b80f9731f60b55e9
---
 media/ndk/NdkMediaDataSource.cpp          | 1 +
 media/ndk/NdkMediaDataSourceCallbacks.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media/ndk/NdkMediaDataSource.cpp b/media/ndk/NdkMediaDataSource.cpp
index 3c10024bb3..1abee93478 100644
--- a/media/ndk/NdkMediaDataSource.cpp
+++ b/media/ndk/NdkMediaDataSource.cpp
@@ -59,6 +59,7 @@ NdkDataSource::NdkDataSource(AMediaDataSource *dataSource)
     AMediaDataSource_setGetSize(mDataSource, dataSource->getSize);
     AMediaDataSource_setClose(mDataSource, dataSource->close);
     AMediaDataSource_setUserdata(mDataSource, dataSource->userdata);
+    AMediaDataSource_setGetAvailableSize(mDataSource, dataSource->getAvailableSize);
     mDataSource->mImpl = dataSource->mImpl;
     mDataSource->mFlags = dataSource->mFlags;
 }
diff --git a/media/ndk/NdkMediaDataSourceCallbacks.cpp b/media/ndk/NdkMediaDataSourceCallbacks.cpp
index f40387f152..86a57da2a8 100644
--- a/media/ndk/NdkMediaDataSourceCallbacks.cpp
+++ b/media/ndk/NdkMediaDataSourceCallbacks.cpp
@@ -43,8 +43,8 @@ void DataSource_close(void *userdata) {
 ssize_t DataSource_getAvailableSize(void *userdata, off64_t offset) {
     off64_t size = -1;
     DataSource *source = static_cast<DataSource *>(userdata);
-    status_t err = source->getAvailableSize(offset, &size);
-    return  err == OK ? size : -1;
+    source->getAvailableSize(offset, &size);
+    return  size;
 }
 
 }  // namespace android