am 8bbba0e3: Merge change If5722b3f into eclair

Merge commit '8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0' into eclair-plus-aosp

* commit '8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0':
  Dont NPE if the thumbnail file cannot be opened.

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;
     }