am 7492d060: am 47acc4b4: Merge "Use try-with-resources instead of Closeables.closeQuietly(Closeable)"

* commit '7492d0606ddfb1aaf483b445161dcb329430597c':
  Use try-with-resources instead of Closeables.closeQuietly(Closeable)

1 files changed, 2 insertions, 10 deletions

diff --git a/variablespeed/tests/src/com/android/ex/variablespeed/MediaPlayerProxyTestCase.java b/variablespeed/tests/src/com/android/ex/variablespeed/MediaPlayerProxyTestCase.java
index 37a0cce..035e238 100644
--- a/variablespeed/tests/src/com/android/ex/variablespeed/MediaPlayerProxyTestCase.java
+++ b/variablespeed/tests/src/com/android/ex/variablespeed/MediaPlayerProxyTestCase.java
@@ -16,8 +16,6 @@
 
 package com.android.ex.variablespeed;
 
-import com.google.common.io.Closeables;
-
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.res.AssetManager;
@@ -532,17 +530,11 @@ public abstract class MediaPlayerProxyTestCase extends InstrumentationTestCase {
         Uri uri = getContentResolver().insert(
                 VoicemailContract.Voicemails.buildSourceUri(packageName), values);
         AssetManager assets = getAssets();
-        OutputStream outputStream = null;
-        InputStream inputStream = null;
-        try {
-            inputStream = assets.open(assetFilename);
-            outputStream = getContentResolver().openOutputStream(uri);
+        try (InputStream inputStream = assets.open(assetFilename);
+             OutputStream outputStream = getContentResolver().openOutputStream(uri)) {
             copyBetweenStreams(inputStream, outputStream);
             mContentUriMap.put(key, uri);
             return uri;
-        } finally {
-            Closeables.closeQuietly(outputStream);
-            Closeables.closeQuietly(inputStream);
         }
     }