diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-11-20 22:32:12 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-11-20 22:32:12 +0000 |
| commit | 7950b98b0c3cc55c5dc82077e1560addefd16780 (patch) | |
| tree | 0f22e3a35eeee9253eedbcc1a9f37686ad2d643a /voice_engine/voice_engine_impl.cc | |
| parent | 4673674e7fc7768f78bfc90f698ccf14a874fce1 (diff) | |
| download | webrtc-7950b98b0c3cc55c5dc82077e1560addefd16780.tar.gz | |
Fixes a crash in VoE when unregistering JNI hooks.
BUG=11695087
R=andrew@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/3939004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5144 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/voice_engine_impl.cc')
| -rw-r--r-- | voice_engine/voice_engine_impl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/voice_engine/voice_engine_impl.cc b/voice_engine/voice_engine_impl.cc index 703b6a44..4af15f9a 100644 --- a/voice_engine/voice_engine_impl.cc +++ b/voice_engine/voice_engine_impl.cc @@ -149,7 +149,11 @@ int VoiceEngine::SetAndroidObjects(void* javaVM, void* env, void* context) { #ifdef WEBRTC_ANDROID #ifdef WEBRTC_ANDROID_OPENSLES - AudioManagerJni::SetAndroidAudioDeviceObjects(javaVM, env, context); + if (javaVM && env && context) { + AudioManagerJni::SetAndroidAudioDeviceObjects(javaVM, env, context); + } else { + AudioManagerJni::ClearAndroidAudioDeviceObjects(); + } return 0; #else return AudioDeviceAndroidJni::SetAndroidAudioDeviceObjects( |