summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-04-21 16:44:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-21 16:44:49 +0000
commitf82c83a8debb468027921e4b479bf80fe7f04ee1 (patch)
tree21c7d65a39ec7cb2080b8825b1318e29276cd72c /media
parent717884ea102e2ba7f4d35e25cc2486fd18e8a0d1 (diff)
parenteaabdce0ad556a91ccf731d042edfd9c5f249f5e (diff)
downloadframeworks_base-f82c83a8debb468027921e4b479bf80fe7f04ee1.zip
frameworks_base-f82c83a8debb468027921e4b479bf80fe7f04ee1.tar.gz
frameworks_base-f82c83a8debb468027921e4b479bf80fe7f04ee1.tar.bz2
am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail
* commit 'eaabdce0ad556a91ccf731d042edfd9c5f249f5e': 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 7df56f4..f1949c0 100644
--- a/media/jni/android_mtp_MtpDatabase.cpp
+++ b/media/jni/android_mtp_MtpDatabase.cpp
@@ -850,6 +850,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);