diff options
| -rw-r--r-- | core/java/android/os/FileUtils.java | 18 | ||||
| -rw-r--r-- | media/java/android/media/ExifInterface.java | 9 | ||||
| -rw-r--r-- | media/java/android/media/MediaMetadataRetriever.java | 17 | ||||
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 13 |
4 files changed, 37 insertions, 20 deletions
diff --git a/core/java/android/os/FileUtils.java b/core/java/android/os/FileUtils.java index f3e0ce9cd19e..1bc64951ad96 100644 --- a/core/java/android/os/FileUtils.java +++ b/core/java/android/os/FileUtils.java @@ -1460,15 +1460,15 @@ public final class FileUtils { /** {@hide} */ @VisibleForTesting public static ParcelFileDescriptor convertToModernFd(FileDescriptor fd) { - try { - Context context = AppGlobals.getInitialApplication(); - if (UserHandle.getAppId(Process.myUid()) == getMediaProviderAppId(context)) { - // Never convert modern fd for MediaProvider, because this requires - // MediaStore#scanFile and can cause infinite loops when MediaProvider scans - return null; - } - return MediaStore.getOriginalMediaFormatFileDescriptor(context, - ParcelFileDescriptor.dup(fd)); + Context context = AppGlobals.getInitialApplication(); + if (UserHandle.getAppId(Process.myUid()) == getMediaProviderAppId(context)) { + // Never convert modern fd for MediaProvider, because this requires + // MediaStore#scanFile and can cause infinite loops when MediaProvider scans + return null; + } + + try (ParcelFileDescriptor dupFd = ParcelFileDescriptor.dup(fd)) { + return MediaStore.getOriginalMediaFormatFileDescriptor(context, dupFd); } catch (Exception e) { Log.d(TAG, "Failed to convert to modern format file descriptor", e); return null; diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java index d746c850a018..37054b8383b1 100644 --- a/media/java/android/media/ExifInterface.java +++ b/media/java/android/media/ExifInterface.java @@ -1573,6 +1573,9 @@ public class ExifInterface { if (isFdDuped) { closeFileDescriptor(fileDescriptor); } + if (modernFd != null) { + modernFd.close(); + } } } @@ -2554,12 +2557,13 @@ public class ExifInterface { private void initForFilename(String filename) throws IOException { FileInputStream in = null; + ParcelFileDescriptor modernFd = null; mAssetInputStream = null; mFilename = filename; mIsInputStream = false; try { in = new FileInputStream(filename); - ParcelFileDescriptor modernFd = FileUtils.convertToModernFd(in.getFD()); + modernFd = FileUtils.convertToModernFd(in.getFD()); if (modernFd != null) { closeQuietly(in); in = new FileInputStream(modernFd.getFileDescriptor()); @@ -2570,6 +2574,9 @@ public class ExifInterface { loadAttributes(in); } finally { closeQuietly(in); + if (modernFd != null) { + modernFd.close(); + } } } diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java index 2943eee5b1da..a15529e99d15 100644 --- a/media/java/android/media/MediaMetadataRetriever.java +++ b/media/java/android/media/MediaMetadataRetriever.java @@ -36,6 +36,7 @@ import android.os.IBinder; import android.os.ParcelFileDescriptor; import android.os.SystemProperties; import android.text.TextUtils; +import android.util.Log; import java.io.FileDescriptor; import java.io.FileInputStream; @@ -52,6 +53,8 @@ import java.util.Map; * frame and meta data from an input media file. */ public class MediaMetadataRetriever implements AutoCloseable { + private static final String TAG = "MediaMetadataRetriever"; + // borrowed from ExoPlayer private static final String[] STANDARD_GENRES = new String[] { // These are the official ID3v1 genres. @@ -301,11 +304,15 @@ public class MediaMetadataRetriever implements AutoCloseable { */ public void setDataSource(FileDescriptor fd, long offset, long length) throws IllegalArgumentException { - ParcelFileDescriptor modernFd = FileUtils.convertToModernFd(fd); - if (modernFd == null) { - _setDataSource(fd, offset, length); - } else { - _setDataSource(modernFd.getFileDescriptor(), offset, length); + + try (ParcelFileDescriptor modernFd = FileUtils.convertToModernFd(fd)) { + if (modernFd == null) { + _setDataSource(fd, offset, length); + } else { + _setDataSource(modernFd.getFileDescriptor(), offset, length); + } + } catch (IOException e) { + Log.w(TAG, "Ignoring IO error while setting data source", e); } } diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 4f761ba0bf6a..26eb2a9dc109 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -1271,11 +1271,14 @@ public class MediaPlayer extends PlayerBase */ public void setDataSource(FileDescriptor fd, long offset, long length) throws IOException, IllegalArgumentException, IllegalStateException { - ParcelFileDescriptor modernFd = FileUtils.convertToModernFd(fd); - if (modernFd == null) { - _setDataSource(fd, offset, length); - } else { - _setDataSource(modernFd.getFileDescriptor(), offset, length); + try (ParcelFileDescriptor modernFd = FileUtils.convertToModernFd(fd)) { + if (modernFd == null) { + _setDataSource(fd, offset, length); + } else { + _setDataSource(modernFd.getFileDescriptor(), offset, length); + } + } catch (IOException e) { + Log.w(TAG, "Ignoring IO error while setting data source", e); } } |