diff options
| author | Eric Laurent <elaurent@google.com> | 2010-10-15 18:42:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:42:06 -0700 |
| commit | 1a32602212bad146990418094b0ffcab05c5eb7b (patch) | |
| tree | 4872128134c47cfb644defb916f669dd1ce5d4eb /core | |
| parent | 21059b637c30cbecbc4eb7e69481a5e582d0ba2b (diff) | |
| parent | 208bb08a8b4896bc51b44aeec41b91d4726007cf (diff) | |
| download | frameworks_base-1a32602212bad146990418094b0ffcab05c5eb7b.zip frameworks_base-1a32602212bad146990418094b0ffcab05c5eb7b.tar.gz frameworks_base-1a32602212bad146990418094b0ffcab05c5eb7b.tar.bz2 | |
am 208bb08a: Merge "Fix issue 3098880." into gingerbread
Merge commit '208bb08a8b4896bc51b44aeec41b91d4726007cf' into gingerbread-plus-aosp
* commit '208bb08a8b4896bc51b44aeec41b91d4726007cf':
Fix issue 3098880.
Diffstat (limited to 'core')
| -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; |