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

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

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

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

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