diff options
| author | Andy Hung <hunga@google.com> | 2014-05-20 17:36:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-20 17:36:11 +0000 |
| commit | b5eb843e4b7c56259e2609e2e668bf5a4cd51f42 (patch) | |
| tree | dc35dc1d955d3d9d9601b3de732ed3523670c7dc /media | |
| parent | e4ca30503cb428f030fe52f429dac0119acfa170 (diff) | |
| parent | 989540264ab553109a272459339c03015fca9197 (diff) | |
| download | frameworks_base-b5eb843e4b7c56259e2609e2e668bf5a4cd51f42.zip frameworks_base-b5eb843e4b7c56259e2609e2e668bf5a4cd51f42.tar.gz frameworks_base-b5eb843e4b7c56259e2609e2e668bf5a4cd51f42.tar.bz2 | |
Merge "Fix 64 bit long pointer size for media scanning"
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/android_media_MediaScanner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaScanner.cpp b/media/jni/android_media_MediaScanner.cpp index 84028b7..d21b442 100644 --- a/media/jni/android_media_MediaScanner.cpp +++ b/media/jni/android_media_MediaScanner.cpp @@ -351,7 +351,7 @@ android_media_MediaScanner_extractAlbumArt( if (!data) { return NULL; } - long len = *((long*)data); + jsize len = *((uint32_t*)data); jbyteArray array = env->NewByteArray(len); if (array != NULL) { |