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

Merge "Fix a crash case" into jb-mr2-dev

Browse Source
This commit is contained in:
Mike J. Chen
2013-05-01 20:59:12 +00:00
committed by Android (Google) Code Review
parent 7521541c2a 67a1218477
commit 2f4cc8eacf
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/jni/audioeffect/android_media_Visualizer.cpp
View File

@@ -164,17 +164,18 @@ static void captureCallback(void* user,
visualizer_callback_cookie *callbackInfo = (visualizer_callback_cookie *)user; visualizer_callback_cookie *callbackInfo = (visualizer_callback_cookie *)user;
JNIEnv *env = AndroidRuntime::getJNIEnv(); 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", ALOGV("captureCallback: callbackInfo %p, visualizer_ref %p visualizer_class %p",
callbackInfo, callbackInfo,
callbackInfo->visualizer_ref, callbackInfo->visualizer_ref,
callbackInfo->visualizer_class); callbackInfo->visualizer_class);
if (!user || !env) { AutoMutex lock(&callbackInfo->callback_data_lock);
ALOGW("captureCallback error user %p, env %p", user, env);
return;
}
if (waveformSize != 0 && waveform != NULL) { if (waveformSize != 0 && waveform != NULL) {
jbyteArray jArray; jbyteArray jArray;