[Android] PlaybackService: Fix NPE

Thomas Guillem git at videolan.org
Wed Jul 1 16:10:10 CEST 2015


vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Jul  1 16:10:01 2015 +0200| [ef466a042b055f81f8f3b907556e34628acf3ab1] | committer: Thomas Guillem

PlaybackService: Fix NPE

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=ef466a042b055f81f8f3b907556e34628acf3ab1
---

 vlc-android/src/org/videolan/vlc/PlaybackService.java |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/vlc-android/src/org/videolan/vlc/PlaybackService.java b/vlc-android/src/org/videolan/vlc/PlaybackService.java
index f530955..ce78739 100644
--- a/vlc-android/src/org/videolan/vlc/PlaybackService.java
+++ b/vlc-android/src/org/videolan/vlc/PlaybackService.java
@@ -1827,6 +1827,8 @@ public class PlaybackService extends Service {
     @MainThread
     public int expand() {
         final Media media = mMediaPlayer.getMedia();
+        if (media == null)
+            return -1;
         final MediaList ml = media.subItems();
         media.release();
         int ret;



More information about the Android mailing list