Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fdb70dc4: Merge "Fix filedescriptor leakage in MediaMetadataRetriever"

Browse Source 
* commit 'fdb70dc4346f801673aa700f3fca2b8cc77b809c':
  Fix filedescriptor leakage in MediaMetadataRetriever
This commit is contained in:
Narayan Kamath
2015-06-25 09:48:46 +00:00
committed by Android Git Automerger
parent 37c688948d fdb70dc434
commit 9d01914a89
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/java/android/media/MediaMetadataRetriever.java
View File

@@ -64,9 +64,7 @@ public class MediaMetadataRetriever
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }
FileInputStream is = null; try (FileInputStream is = new FileInputStream(path)) {
try {
is = new FileInputStream(path);
FileDescriptor fd = is.getFD(); FileDescriptor fd = is.getFD();
setDataSource(fd, 0, 0x7ffffffffffffffL); setDataSource(fd, 0, 0x7ffffffffffffffL);
} catch (FileNotFoundException fileEx) { } catch (FileNotFoundException fileEx) {
@@ -74,12 +72,6 @@ public class MediaMetadataRetriever
} catch (IOException ioEx) { } catch (IOException ioEx) {
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }
try {
if (is != null) {
is.close();
}
} catch (Exception e) {}
} }
/** /**