diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-29 19:52:23 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-29 19:52:23 -0400 |
| commit | 8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0 (patch) | |
| tree | 1d77709a39e088a6c048bf711bad2c39d74df053 /media | |
| parent | 277a41a771c56727ad7456dad23f964e9e3ed546 (diff) | |
| parent | f5722b3f22e016a8f21c628776cd0746ef164c19 (diff) | |
| download | frameworks_base-8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0.zip frameworks_base-8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0.tar.gz frameworks_base-8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0.tar.bz2 | |
Merge change If5722b3f into eclair
* changes:
Dont NPE if the thumbnail file cannot be opened.
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MiniThumbFile.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/java/android/media/MiniThumbFile.java b/media/java/android/media/MiniThumbFile.java index 3cc115e..22c6459 100644 --- a/media/java/android/media/MiniThumbFile.java +++ b/media/java/android/media/MiniThumbFile.java @@ -119,7 +119,9 @@ public class MiniThumbFile { // ignore exception } } - mChannel = mMiniThumbFile.getChannel(); + if (mMiniThumbFile != null) { + mChannel = mMiniThumbFile.getChannel(); + } } return mMiniThumbFile; } |