summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-04-21 16:47:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-21 16:47:41 +0000
commit3fafb4ebf2572578c6d7df742593ee5ed17748a8 (patch)
tree142af1df056ad7dfb036a1da3c77f1eebefeeb70 /media
parent6fca81de9b2079ec88e785f58bf49bf1f0c105e2 (diff)
parentf82c83a8debb468027921e4b479bf80fe7f04ee1 (diff)
downloadframeworks_base-3fafb4ebf2572578c6d7df742593ee5ed17748a8.zip
frameworks_base-3fafb4ebf2572578c6d7df742593ee5ed17748a8.tar.gz
frameworks_base-3fafb4ebf2572578c6d7df742593ee5ed17748a8.tar.bz2
am f82c83a8: am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail
* commit 'f82c83a8debb468027921e4b479bf80fe7f04ee1': MTP: Fix getThumbnail
Diffstat (limited to 'media')
-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 0e55228..d781336 100644
--- a/media/jni/android_mtp_MtpDatabase.cpp
+++ b/media/jni/android_mtp_MtpDatabase.cpp
@@ -859,6 +859,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);