commit d691c0ae1efccb33c383acc8749032d44adddb97
author Paul Duffin <paulduffin@google.com> Mon Jun 01 14:29:23 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 01 14:29:23 2015 +0000
tree 22ccb2d655c88946246b63ae27a5554157ff7a18
parent 649e21353fb0f526a13401d8eac30a266315db9c
parent cbc0db8f9e1382f4bf60b4e707c5eb6bc20f2677

am cbc0db8f: Merge "Switching to use try-with-resources"

* commit 'cbc0db8f9e1382f4bf60b4e707c5eb6bc20f2677':
  Switching to use try-with-resources

src/com/android/providers/contacts/debug/DataExporter.java

diff --git a/src/com/android/providers/contacts/debug/DataExporter.java b/src/com/android/providers/contacts/debug/DataExporter.java
index c7c7dea..3ea49bd 100644
--- a/src/com/android/providers/contacts/debug/DataExporter.java
+++ b/src/com/android/providers/contacts/debug/DataExporter.java
@@ -17,7 +17,6 @@
 package com.android.providers.contacts.debug;
 
 import com.android.providers.contacts.util.Hex;
-import com.google.common.io.Closeables;
 
 import android.content.Context;
 import android.net.Uri;
@@ -62,12 +61,10 @@
         Log.i(TAG, "Dump started...");
 
         ensureOutputDirectory(context);
-        final ZipOutputStream os = new ZipOutputStream(new FileOutputStream(outFile));
-        os.setLevel(Deflater.BEST_COMPRESSION);
-        try {
+        
+        try (ZipOutputStream os = new ZipOutputStream(new FileOutputStream(outFile))) {
+            os.setLevel(Deflater.BEST_COMPRESSION);
             addDirectory(context, os, context.getFilesDir().getParentFile(), "contacts-files");
-        } finally {
-            Closeables.closeQuietly(os);
         }
         Log.i(TAG, "Dump finished.");
         return DumpFileProvider.AUTHORITY_URI.buildUpon().appendPath(fileName).build();