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

Merge "Race-condition in SoundPool during release"

Browse Source
This commit is contained in:
Narayan Kamath
2015-01-05 17:57:25 +00:00
committed by Gerrit Code Review
parent 873b291b15 ed86e19af2
commit ea4cdd4454
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); SoundPool *ap = MusterSoundPool(env, thiz);
if (ap != NULL) { if (ap != NULL) {
// release weak reference // release weak reference and clear callback
jobject weakRef = (jobject) ap->getUserData(); jobject weakRef = (jobject) ap->getUserData();
ap->setCallback(NULL, NULL);
if (weakRef != NULL) { if (weakRef != NULL) {
env->DeleteGlobalRef(weakRef); env->DeleteGlobalRef(weakRef);
} }
// clear callback and native context // clear native context
ap->setCallback(NULL, NULL);
env->SetLongField(thiz, fields.mNativeContext, 0); env->SetLongField(thiz, fields.mNativeContext, 0);
delete ap; delete ap;
} }