From 81b37d8bde34ef3bb8eb8dfd7492761a39a8fd09 Mon Sep 17 00:00:00 2001
From: Gloria Wang <gwang@google.com>
Date: Thu, 15 Sep 2011 15:28:43 -0700
Subject: [PATCH] If media player has died already, do not dec the old surface
 texture reference. Otherwise segfault will occur. For bug 5327664. Do not
 merge.

Change-Id: I03ea7bc047aa99a106f1e010dac74f75a833ef84
---
 media/jni/android_media_MediaPlayer.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index f16a029a36cf5..c270f21a7b25e 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -247,6 +247,11 @@ getVideoSurfaceTexture(JNIEnv* env, jobject thiz) {
 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);