commit 152f7b3985a777403168722891b7941c16a0cfaa
author Gloria Wang <gwang@google.com> Thu Sep 15 16:56:41 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 15 16:56:41 2011 -0700
tree 95f32894f4a299c6e30d0585263ee337e5bacc27
parent b851f15ee22222569bfbda1a017c12dcc89ec3ab
parent e828beb3866e2275cd26acd2a58f9f8a3967ba30

Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664."

media/jni/android_media_MediaPlayer.cpp

diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index f16a029..c270f21 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -247,6 +247,11 @@
 static void
 decVideoSurfaceRef(JNIEnv *env, jobject thiz)
 {
+    sp<MediaPlayer> mp = getMediaPlayer(env, thiz);
+    if (mp == NULL) {
+        return;
+    }
+
     sp<ISurfaceTexture> old_st = getVideoSurfaceTexture(env, thiz);
     if (old_st != NULL) {
         old_st->decStrong(thiz);