commit fdb70dc4346f801673aa700f3fca2b8cc77b809c
author Narayan Kamath <narayan@google.com> Thu Jun 25 08:33:49 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 25 08:33:50 2015 +0000
tree 62592a827185a72cc4a59d21f62359870889db2c
parent a78c0e0b9aff70d03101a25b47024f6d02cb93e2
parent e1856e482933b24e66f0f432ac0cb0157787e9ce

Merge "Fix filedescriptor leakage in MediaMetadataRetriever"

media/java/android/media/MediaMetadataRetriever.java

diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java
index 9a69c06..9a73dfc 100644
--- a/media/java/android/media/MediaMetadataRetriever.java
+++ b/media/java/android/media/MediaMetadataRetriever.java
@@ -64,9 +64,7 @@
             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 @@
         } catch (IOException ioEx) {
             throw new IllegalArgumentException();
         }
-
-        try {
-            if (is != null) {
-                is.close();
-            }
-        } catch (Exception e) {}
     }
 
     /**