From 3c56221af7160355f5265bc2dc14322636d945fc Mon Sep 17 00:00:00 2001
From: Dave Sparks <davidsparks@android.com>
Date: Wed, 23 Dec 2009 17:19:22 -0800
Subject: [PATCH] Fix SoundPool restart problem CheckJNI issue.

---
 media/jni/soundpool/android_media_SoundPool.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/media/jni/soundpool/android_media_SoundPool.cpp b/media/jni/soundpool/android_media_SoundPool.cpp
index f6ea916e5d118..f0677a692c9f6 100644
--- a/media/jni/soundpool/android_media_SoundPool.cpp
+++ b/media/jni/soundpool/android_media_SoundPool.cpp
@@ -283,9 +283,13 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
                                                "(Ljava/lang/Object;IIILjava/lang/Object;)V");
     if (fields.mPostEvent == NULL) {
         LOGE("Can't find android/media/SoundPool.postEventFromNative");
-        return -1;
+        goto bail;
     }
 
+    // create a reference to class. Technically, we're leaking this reference
+    // since it's a static object.
+    fields.mSoundPoolClass = (jclass) env->NewGlobalRef(clazz);
+
     if (AndroidRuntime::registerNativeMethods(env, kClassPathName, gMethods, NELEM(gMethods)) < 0)
         goto bail;