From a4b5f739f5203d4f8c327a2670e427510e5867ef Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 22 May 2015 13:20:57 +0100 Subject: Use try-with-resources instead of Closeables.closeQuietly(Closeable) Closeables.closeQuietly(Closeable) has been deprecated for a long time and removed in version 17. It was temporarily patched back in to allow upgrading from version 14 but it will be removed completely once we upgrade to version 18 so any usages need to be updated. Change-Id: Ifae0124975ed20f2549e743ee6fad155e39c89b4 --- .../android/ex/variablespeed/MediaPlayerProxyTestCase.java | 12 ++---------- 1 file 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); } } -- cgit v1.2.3