diff options
| author | Mike J. Chen <mjchen@google.com> | 2013-05-01 20:59:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-01 20:59:12 +0000 |
| commit | 2f4cc8eacfe819a4f54aa4b0318ad1d31ecc2a40 (patch) | |
| tree | 572c85348ab5a58e2674829bee22b2eccd2f84f1 | |
| parent | 7521541c2a26d29c28c6b1bd60fc4550e5eb5c49 (diff) | |
| parent | 67a12184776605b6e6ddc01ca91b533a2e37a40b (diff) | |
| download | frameworks_base-2f4cc8eacfe819a4f54aa4b0318ad1d31ecc2a40.zip frameworks_base-2f4cc8eacfe819a4f54aa4b0318ad1d31ecc2a40.tar.gz frameworks_base-2f4cc8eacfe819a4f54aa4b0318ad1d31ecc2a40.tar.bz2 | |
Merge "Fix a crash case" into jb-mr2-dev
| -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; |