commit c82be5f27f1dd9da665b0ca52590cc30ede4e78a
author Narayan Kamath <narayan@google.com> Mon Jan 05 18:10:33 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 05 18:10:33 2015 +0000
tree 4e883dfdcce0f6fc32f7d48809de8c5d6c22c6dc
parent a199880a01d65779ab48131ab98f131d8fb4e341
parent b7974bd31d06d439cb75f8a3a0ad032fa689c729

am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"
automerge: b7974bd

* commit 'b7974bd31d06d439cb75f8a3a0ad032fa689c729':
  Race-condition in SoundPool during release

media/jni/soundpool/android_media_SoundPool_SoundPoolImpl.cpp

diff --git a/media/jni/soundpool/android_media_SoundPool_SoundPoolImpl.cpp b/media/jni/soundpool/android_media_SoundPool_SoundPoolImpl.cpp
index ce20e52..baf61d5 100644
--- a/media/jni/soundpool/android_media_SoundPool_SoundPoolImpl.cpp
+++ b/media/jni/soundpool/android_media_SoundPool_SoundPoolImpl.cpp
@@ -231,14 +231,14 @@
     SoundPool *ap = MusterSoundPool(env, thiz);
     if (ap != NULL) {
 
-        // release weak reference
+        // release weak reference and clear callback
         jobject weakRef = (jobject) ap->getUserData();
+        ap->setCallback(NULL, NULL);
         if (weakRef != NULL) {
             env->DeleteGlobalRef(weakRef);
         }
 
-        // clear callback and native context
-        ap->setCallback(NULL, NULL);
+        // clear native context
         env->SetLongField(thiz, fields.mNativeContext, 0);
         delete ap;
     }