Merge "Redundant/duplicate method to close Streams Fixes: 62304559 Test: the... (4f64bd56) · Commits · e / os / android_frameworks_base

drm/java/android/drm/DrmUtils.java

+4 −13

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.drm;

		import java.io.BufferedInputStream;
		import java.io.Closeable;
		import java.io.File;
		import java.io.FileInputStream;
		import java.io.FileOutputStream;
		@@ -79,26 +80,16 @@ public class DrmUtils {
		file.delete();
		}

		private static void quietlyDispose(InputStream stream) {
		private static void quietlyDispose(Closeable closable) {
		try {
		if (null != stream) {
		stream.close();
		if (null != closable) {
		closable.close();
		}
		} catch (IOException e) {
		// no need to care, at least as of now
		}
		}

		private static void quietlyDispose(OutputStream stream) {
		try {
		if (null != stream) {
		stream.close();
		}
		} catch (IOException e) {
		// no need to care
		}
		}

		/**
		* Gets an instance of {@link DrmUtils.ExtendedMetadataParser}, which can be used to parse
		* extended metadata embedded in DRM constraint information.