summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2009-09-29 16:30:30 -0700
committerChih-Chung Chang <chihchung@google.com>2009-09-29 16:31:16 -0700
commitf5722b3f22e016a8f21c628776cd0746ef164c19 (patch)
tree4f489e8ad22da154469c6a20a266d418d91021fc /media/java
parentd35afcda674eaa0222f0adbf8d712bde3a388a39 (diff)
downloadframeworks_base-f5722b3f22e016a8f21c628776cd0746ef164c19.zip
frameworks_base-f5722b3f22e016a8f21c628776cd0746ef164c19.tar.gz
frameworks_base-f5722b3f22e016a8f21c628776cd0746ef164c19.tar.bz2
Dont NPE if the thumbnail file cannot be opened.
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/media/MiniThumbFile.java4
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;
}