am 9d01914a: am fdb70dc4: Merge "Fix filedescriptor leakage in MediaMetadataRetriever" (cd1cdb46) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaMetadataRetriever.java

+1 −9

Original line number	Diff line number	Diff line
		@@ -64,9 +64,7 @@ public class MediaMetadataRetriever
		throw new IllegalArgumentException();
		}

		FileInputStream is = null;
		try {
		is = new FileInputStream(path);
		try (FileInputStream is = new FileInputStream(path)) {
		FileDescriptor fd = is.getFD();
		setDataSource(fd, 0, 0x7ffffffffffffffL);
		} catch (FileNotFoundException fileEx) {
		@@ -74,12 +72,6 @@ public class MediaMetadataRetriever
		} catch (IOException ioEx) {
		throw new IllegalArgumentException();
		}

		try {
		if (is != null) {
		is.close();
		}
		} catch (Exception e) {}
		}

		/**