summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-04-21 16:40:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-21 16:40:18 +0000
commiteaabdce0ad556a91ccf731d042edfd9c5f249f5e (patch)
treec3254d6f4f8b089f091000241ee0f8e947e5e979 /media/jni
parent0090082ed040dd3ea897cf13d7e837dadd06ca3f (diff)
parentca1f8f6d14a144dde64112cd471df5e9539ad521 (diff)
downloadframeworks_base-eaabdce0ad556a91ccf731d042edfd9c5f249f5e.zip
frameworks_base-eaabdce0ad556a91ccf731d042edfd9c5f249f5e.tar.gz
frameworks_base-eaabdce0ad556a91ccf731d042edfd9c5f249f5e.tar.bz2
am ca1f8f6d: am c4367721: MTP: Fix getThumbnail
* commit 'ca1f8f6d14a144dde64112cd471df5e9539ad521': MTP: Fix getThumbnail
Diffstat (limited to 'media/jni')
-rw-r--r--media/jni/android_mtp_MtpDatabase.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp
index 6b0bd0d..4689867e 100644
--- a/media/jni/android_mtp_MtpDatabase.cpp
+++ b/media/jni/android_mtp_MtpDatabase.cpp
@@ -849,6 +849,7 @@ void* MyMtpDatabase::getThumbnail(MtpObjectHandle handle, size_t& outThumbSize)
result = malloc(exifdata->size);
if (result) {
memcpy(result, exifdata->data, exifdata->size);
+ outThumbSize = exifdata->size;
}
}
exif_data_unref(exifdata);