diff options
| author | Mike J. Chen <mjchen@google.com> | 2013-05-01 14:04:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-01 14:04:59 -0700 |
| commit | 1d507f7b9b163df6d19030f1cbf5d9191c6b7928 (patch) | |
| tree | 307baa20a8238b714a28b8f2f2bef4f9006e0e8e | |
| parent | 3bb591abb7c0d979d22249748df47f8854ea1a56 (diff) | |
| parent | 94264d522efcc21ac749a6444fbea90916f575c9 (diff) | |
| download | frameworks_base-1d507f7b9b163df6d19030f1cbf5d9191c6b7928.zip frameworks_base-1d507f7b9b163df6d19030f1cbf5d9191c6b7928.tar.gz frameworks_base-1d507f7b9b163df6d19030f1cbf5d9191c6b7928.tar.bz2 | |
am 94264d52: am 2f4cc8ea: Merge "Fix a crash case" into jb-mr2-dev
* commit '94264d522efcc21ac749a6444fbea90916f575c9':
Fix a crash case
| -rw-r--r-- | media/jni/audioeffect/android_media_Visualizer.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/media/jni/audioeffect/android_media_Visualizer.cpp b/media/jni/audioeffect/android_media_Visualizer.cpp index c2655c7..4d77cfd 100644 --- a/media/jni/audioeffect/android_media_Visualizer.cpp +++ b/media/jni/audioeffect/android_media_Visualizer.cpp @@ -164,17 +164,18 @@ static void captureCallback(void* user, visualizer_callback_cookie *callbackInfo = (visualizer_callback_cookie *)user; JNIEnv *env = AndroidRuntime::getJNIEnv(); - AutoMutex lock(&callbackInfo->callback_data_lock); + + if (!user || !env) { + ALOGW("captureCallback error user %p, env %p", user, env); + return; + } ALOGV("captureCallback: callbackInfo %p, visualizer_ref %p visualizer_class %p", callbackInfo, callbackInfo->visualizer_ref, callbackInfo->visualizer_class); - if (!user || !env) { - ALOGW("captureCallback error user %p, env %p", user, env); - return; - } + AutoMutex lock(&callbackInfo->callback_data_lock); if (waveformSize != 0 && waveform != NULL) { jbyteArray jArray; |