diff options
| author | Marco Nelissen <marcone@google.com> | 2014-06-23 22:40:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-23 22:40:28 +0000 |
| commit | d3afc9c1d8b1585a1d6e0d3d840e9dd93081ec0c (patch) | |
| tree | 4a877b5030082233204490da3a63956b375a8d96 /core/java/android/provider | |
| parent | 6b39324d7756f1a36faf275941aabb19ee6bbb53 (diff) | |
| parent | 909a1b2e73efdb592b5a8f2c2e786f4c6c4bad14 (diff) | |
| download | frameworks_base-d3afc9c1d8b1585a1d6e0d3d840e9dd93081ec0c.zip frameworks_base-d3afc9c1d8b1585a1d6e0d3d840e9dd93081ec0c.tar.gz frameworks_base-d3afc9c1d8b1585a1d6e0d3d840e9dd93081ec0c.tar.bz2 | |
am 909a1b2e: am c4d37f58: am 0eee8ac2: Merge "Fix thumbnail bug"
* commit '909a1b2e73efdb592b5a8f2c2e786f4c6c4bad14':
Fix thumbnail bug
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index 0fe764f..325917e 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -40,6 +40,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.Arrays; /** * The Media provider contains meta data for all available media on both internal @@ -671,6 +672,7 @@ public final class MediaStore { if (sThumbBuf == null) { sThumbBuf = new byte[MiniThumbFile.BYTES_PER_MINTHUMB]; } + Arrays.fill(sThumbBuf, (byte)0); if (thumbFile.getMiniThumbFromFile(origId, sThumbBuf) != null) { bitmap = BitmapFactory.decodeByteArray(sThumbBuf, 0, sThumbBuf.length); if (bitmap == null) { |