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

Merge "Frameworks/base: Fix old code in MediaPlayer" am: 17b069c

Browse Source 
am: f664e82

* commit 'f664e8227097b81fd641549ccd3de9c5d9a8b0e3':
  Frameworks/base: Fix old code in MediaPlayer

Change-Id: I7239d5fd2e7593047b8806bf0fdbd30fe2dd1487
This commit is contained in:
Andreas Gampe
2016-04-16 00:49:07 +00:00
committed by android-build-merger
parent 6797d86d76 f664e82270
commit 3bd314fe77
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
media/java/android/media/MediaPlayer.java
View File

@@ -2474,9 +2474,9 @@ public class MediaPlayer extends PlayerBase
throw new IllegalArgumentException("Illegal mimeType for timed text source: " + mime); throw new IllegalArgumentException("Illegal mimeType for timed text source: " + mime);
} }
FileDescriptor fd2; final FileDescriptor dupedFd;
try { try {
fd2 = Libcore.os.dup(fd); dupedFd = Libcore.os.dup(fd);
} catch (ErrnoException ex) { } catch (ErrnoException ex) {
Log.e(TAG, ex.getMessage(), ex); Log.e(TAG, ex.getMessage(), ex);
throw new RuntimeException(ex); throw new RuntimeException(ex);
@@ -2501,7 +2501,6 @@ public class MediaPlayer extends PlayerBase
mIndexTrackPairs.add(Pair.<Integer, SubtitleTrack>create(null, track)); mIndexTrackPairs.add(Pair.<Integer, SubtitleTrack>create(null, track));
} }
final FileDescriptor fd3 = fd2;
final long offset2 = offset; final long offset2 = offset;
final long length2 = length; final long length2 = length;
final HandlerThread thread = new HandlerThread( final HandlerThread thread = new HandlerThread(
@@ -2511,14 +2510,13 @@ public class MediaPlayer extends PlayerBase
Handler handler = new Handler(thread.getLooper()); Handler handler = new Handler(thread.getLooper());
handler.post(new Runnable() { handler.post(new Runnable() {
private int addTrack() { private int addTrack() {
InputStream is = null;
final ByteArrayOutputStream bos = new ByteArrayOutputStream(); final ByteArrayOutputStream bos = new ByteArrayOutputStream();
try { try {
Libcore.os.lseek(fd3, offset2, OsConstants.SEEK_SET); Libcore.os.lseek(dupedFd, offset2, OsConstants.SEEK_SET);
byte[] buffer = new byte[4096]; byte[] buffer = new byte[4096];
for (long total = 0; total < length2;) { for (long total = 0; total < length2;) {
int bytesToRead = (int) Math.min(buffer.length, length2 - total); int bytesToRead = (int) Math.min(buffer.length, length2 - total);
int bytes = IoBridge.read(fd3, buffer, 0, bytesToRead); int bytes = IoBridge.read(dupedFd, buffer, 0, bytesToRead);
if (bytes < 0) { if (bytes < 0) {
break; break;
} else { } else {
@@ -2532,12 +2530,10 @@ public class MediaPlayer extends PlayerBase
Log.e(TAG, e.getMessage(), e); Log.e(TAG, e.getMessage(), e);
return MEDIA_INFO_TIMED_TEXT_ERROR; return MEDIA_INFO_TIMED_TEXT_ERROR;
} finally { } finally {
if (is != null) { try {
try { Libcore.os.close(dupedFd);
is.close(); } catch (ErrnoException e) {
} catch (IOException e) { Log.e(TAG, e.getMessage(), e);
Log.e(TAG, e.getMessage(), e);
}
} }
} }
} }