summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-04-21 08:49:30 -0700
committerThe Android Automerger <android-build@google.com>2014-04-22 15:04:27 -0700
commit76593e19f9aeff5242f006c105a7e77e2cee33fd (patch)
tree6d4d6ab9ba9036f7301e3e6fbe3e42f720fe53f1
parentf02d7bf71a41a5258a6266d5fa3b25b55f803aed (diff)
downloadbase-kitkat-mr2-release.tar.gz
The thumbnail size was not being passed to the MTP stack so getThumbnail was returning zero length data. Bug: 13747419 Change-Id: I309d35b5c46ab5f631c0dcb5981f7896bb5a2ed5
-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 067e7a6af8b0..f8fb1440796a 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);