commit d4dda2b8c4c3b0309ed668060247ce601808532f
author Paul Duffin <paulduffin@google.com> Mon Jun 01 14:24:30 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 01 14:24:31 2015 +0000
tree ea1f071b15e450c9522662c60a22eb720d96df9f
parent 5f35f34f019bba6ff705521b28affbfdb75abd7b
parent 6f0b0802b1925bc24af5206a5f4809a2fa3c047d

Merge "Switching to use try-with-resources"

src/com/android/contacts/util/ContactPhotoUtils.java

diff --git a/src/com/android/contacts/util/ContactPhotoUtils.java b/src/com/android/contacts/util/ContactPhotoUtils.java
index 3f79da5..a86600f 100644
--- a/src/com/android/contacts/util/ContactPhotoUtils.java
+++ b/src/com/android/contacts/util/ContactPhotoUtils.java
@@ -148,13 +148,9 @@
      */
     public static boolean savePhotoFromUriToUri(Context context, Uri inputUri, Uri outputUri,
             boolean deleteAfterSave) {
-        FileOutputStream outputStream = null;
-        InputStream inputStream = null;
-        try {
-            outputStream = context.getContentResolver()
-                    .openAssetFileDescriptor(outputUri, "rw").createOutputStream();
-            inputStream = context.getContentResolver().openInputStream(
-                    inputUri);
+        try (FileOutputStream outputStream = context.getContentResolver()
+                 .openAssetFileDescriptor(outputUri, "rw").createOutputStream();
+             InputStream inputStream = context.getContentResolver().openInputStream(inputUri)) {
 
             final byte[] buffer = new byte[16 * 1024];
             int length;
@@ -168,8 +164,6 @@
             Log.e(TAG, "Failed to write photo: " + inputUri.toString() + " because: " + e);
             return false;
         } finally {
-            Closeables.closeQuietly(inputStream);
-            Closeables.closeQuietly(outputStream);
             if (deleteAfterSave) {
                 context.getContentResolver().delete(inputUri, null, null);
             }