Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'ea4cdd44541d76adea9b0b185740796d6cf6ac64':
  Race-condition in SoundPool during release
This commit is contained in:
Narayan Kamath
2015-01-05 18:02:32 +00:00
committed by Android Git Automerger
parent 3d6cfe0eb1 ea4cdd4454
commit dd65a4f735
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/jni/soundpool/android_media_SoundPool_SoundPoolImpl.cpp
View File

@@ -231,14 +231,14 @@ android_media_SoundPool_SoundPoolImpl_release(JNIEnv *env, jobject thiz)
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;
}