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

am 57c332bd: am c024de3c: media: ignore null InputStream

Browse Source 
* commit '57c332bd4ad9a2120e5ca93ae5ce9175913aeedd':
  media: ignore null InputStream
This commit is contained in:
Ronghua Wu
2015-10-13 15:46:00 +00:00
committed by Android Git Automerger
parent 8738d73659 57c332bd4a
commit c2fd35f7ae
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2243,10 +2243,14 @@ public class MediaPlayer implements SubtitleController.Listener
final InputStream fIs = is;
final MediaFormat fFormat = format;
// Ensure all input streams are closed. It is also a handy
// way to implement timeouts in the future.
synchronized(mOpenSubtitleSources) {
mOpenSubtitleSources.add(is);
if (is != null) {
// Ensure all input streams are closed. It is also a handy
// way to implement timeouts in the future.
synchronized(mOpenSubtitleSources) {
mOpenSubtitleSources.add(is);
}
} else {
Log.w(TAG, "addSubtitleSource called with null InputStream");
}
// process each subtitle in its own thread