Chromium Code Reviews| Index: chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java |
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java |
| index b34b6ec6c09736007cac405cced2b28138e7c7d6..518f112631d57df93e4174b1dad59e51535e82f6 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareHelper.java |
| @@ -40,6 +40,7 @@ import org.chromium.base.ApplicationState; |
| import org.chromium.base.ApplicationStatus; |
| import org.chromium.base.ContextUtils; |
| import org.chromium.base.Log; |
| +import org.chromium.base.StreamUtil; |
| import org.chromium.base.VisibleForTesting; |
| import org.chromium.base.annotations.SuppressFBWarnings; |
| import org.chromium.base.metrics.RecordHistogram; |
| @@ -397,18 +398,12 @@ public class ShareHelper { |
| File saveFile = File.createTempFile(fileName, JPEG_EXTENSION, path); |
| fOut = new FileOutputStream(saveFile); |
| screenshot.compress(Bitmap.CompressFormat.JPEG, 85, fOut); |
| - fOut.flush(); |
|
Ted C
2016/10/14 16:12:26
i guess the flush here wasn't actually needed? i
agrieve
2016/10/14 17:47:14
Right - close() flush()es.
|
| - fOut.close(); |
| return saveFile; |
| } |
| } catch (IOException ie) { |
| - if (fOut != null) { |
| - try { |
| - fOut.close(); |
| - } catch (IOException e) { |
| - // Ignore exception. |
| - } |
| - } |
| + Log.w(TAG, "Ignoring IOException when saving screenshot.", ie); |
| + } finally { |
| + StreamUtil.closeQuietly(fOut); |
| } |
| return null; |