From c024de3c946c18e8e4799eb8d372fdec3146f8cf Mon Sep 17 00:00:00 2001 From: Ronghua Wu Date: Tue, 11 Aug 2015 13:33:49 -0700 Subject: media: ignore null InputStream Bug: 22854896 Change-Id: I20b9e28bbba6dec73538ee6937d337c2e2b971f4 --- media/java/android/media/MediaPlayer.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'media') diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 13b2878..2e82e2f 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -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 -- cgit v1.1