commit c4de6f81d4533acbfc162d051de480d474b72e76
author Jamie Gennis <jgennis@google.com> Mon Oct 17 12:38:36 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 17 12:38:36 2011 -0700
tree 532284a6fe24e807ac1c44d6f9c12dada42cd894
parent 63fae9d56286e7c51261a5a00755466b350efa33
parent f76afc80d229cf0c918e849acf5d8c4f5d4ffd07

Merge "MediaPlayer: properly handle released surfaces" into ics-mr0

media/jni/android_media_MediaPlayer.cpp

diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index f3174fe..63cbf5e 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -274,8 +274,14 @@
     sp<ISurfaceTexture> new_st;
     if (jsurface) {
         sp<Surface> surface(Surface_getSurface(env, jsurface));
-        new_st = surface->getSurfaceTexture();
-        new_st->incStrong(thiz);
+        if (surface != NULL) {
+            new_st = surface->getSurfaceTexture();
+            new_st->incStrong(thiz);
+        } else {
+            jniThrowException(env, "java/lang/IllegalArgumentException",
+                    "The surface has been released");
+            return;
+        }
     }
 
     env->SetIntField(thiz, fields.surface_texture, (int)new_st.get());