commit b093e485bbd790cc4d9678451c8cce4d361c2cf2
author Elliott Hughes <enh@google.com> Fri Apr 11 17:37:54 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 11 17:37:54 2014 +0000
tree b4025e6172cbac8889036a8c83d511b027e98be9
parent 8cd319b84635454746803b0eed7e2626d7945a09
parent 79d097ee5bd3281669b39419e1fa7aa2f5e96820

Merge "generateProjectThumbnail can fail to close output stream"

media/java/android/media/videoeditor/VideoEditorImpl.java

diff --git a/media/java/android/media/videoeditor/VideoEditorImpl.java b/media/java/android/media/videoeditor/VideoEditorImpl.java
index 2446c2f..fbf2eab 100644
--- a/media/java/android/media/videoeditor/VideoEditorImpl.java
+++ b/media/java/android/media/videoeditor/VideoEditorImpl.java
@@ -47,6 +47,8 @@
 import android.os.SystemProperties;
 import android.os.Environment;
 
+import libcore.io.IoUtils;
+
 /**
  * The VideoEditor implementation {@hide}
  */
@@ -1859,15 +1861,15 @@
                 }
             }
 
+            FileOutputStream stream = null;
             try {
-                FileOutputStream stream = new FileOutputStream(mProjectPath + "/"
-                                                          + THUMBNAIL_FILENAME);
+                stream = new FileOutputStream(mProjectPath + "/" + THUMBNAIL_FILENAME);
                 projectBitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);
                 stream.flush();
-                stream.close();
             } catch (IOException e) {
                 throw new IllegalArgumentException ("Error creating project thumbnail");
             } finally {
+                IoUtils.closeQuietly(stream);
                 projectBitmap.recycle();
             }
         }