diff options
| author | Eric Laurent <elaurent@google.com> | 2010-10-18 10:32:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 10:32:05 -0700 |
| commit | dd70133ceb314b2753b6b0e7d22565d56eaf9785 (patch) | |
| tree | 7d662b37669b78d4c6da35ed06d461379f64258e /core/jni | |
| parent | 1012f1f1487e23458f81bf75ab474e6473761904 (diff) | |
| parent | 1a32602212bad146990418094b0ffcab05c5eb7b (diff) | |
| download | frameworks_base-dd70133ceb314b2753b6b0e7d22565d56eaf9785.zip frameworks_base-dd70133ceb314b2753b6b0e7d22565d56eaf9785.tar.gz frameworks_base-dd70133ceb314b2753b6b0e7d22565d56eaf9785.tar.bz2 | |
am 1a326022: am 208bb08a: Merge "Fix issue 3098880." into gingerbread
Merge commit '1a32602212bad146990418094b0ffcab05c5eb7b'
* commit '1a32602212bad146990418094b0ffcab05c5eb7b':
Fix issue 3098880.
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_media_AudioSystem.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index 3995026..40b9334 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -99,6 +99,10 @@ android_media_AudioSystem_getParameters(JNIEnv *env, jobject thiz, jstring keys) void android_media_AudioSystem_error_callback(status_t err) { JNIEnv *env = AndroidRuntime::getJNIEnv(); + if (env == NULL) { + return; + } + jclass clazz = env->FindClass("android/media/AudioSystem"); int error; |