From 8bd826d6aa8215354ec7873fd4601bedfc4cc793 Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gpascutto@mozilla.com>
Date: Thu, 7 Nov 2013 20:07:48 -0500
Subject: [PATCH] Bug 932112: Initialize both JNI and OpenSLES so fallback can
 work. r=jesup

---
 .../trunk/webrtc/voice_engine/voice_engine_impl.cc  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/media/webrtc/trunk/webrtc/voice_engine/voice_engine_impl.cc b/media/webrtc/trunk/webrtc/voice_engine/voice_engine_impl.cc
index af70caf1f57..9ac956f0639 100644
--- a/media/webrtc/trunk/webrtc/voice_engine/voice_engine_impl.cc
+++ b/media/webrtc/trunk/webrtc/voice_engine/voice_engine_impl.cc
@@ -11,7 +11,8 @@
 #if !defined(WEBRTC_GONK)
 #if defined(WEBRTC_ANDROID_OPENSLES)
 #include "webrtc/modules/audio_device/android/audio_manager_jni.h"
-#elif defined(WEBRTC_ANDROID)
+#endif
+#if defined(WEBRTC_ANDROID)
 #include "webrtc/modules/audio_device/android/audio_device_jni_android.h"
 #endif
 #endif
@@ -147,19 +148,17 @@ bool VoiceEngine::Delete(VoiceEngine*& voiceEngine)
 
 int VoiceEngine::SetAndroidObjects(void* javaVM, void* env, void* context)
 {
-#if !defined(WEBRTC_GONK)
+#if !defined(WEBRTC_GONK) && defined(ANDROID)
 #if defined(WEBRTC_ANDROID_OPENSLES)
+    // Initialize both backends. The OpenSLES one will fall back
+    // to JNI if some failure happens.
     AudioManagerJni::SetAndroidAudioDeviceObjects(javaVM, env, context);
-    return 0;
-#elif defined(ANDROID)
+#endif
     return AudioDeviceAndroidJni::SetAndroidAudioDeviceObjects(
          javaVM, env, context);
 #else
     return -1;
 #endif
-#else
-    return -1;
-#endif
 }
 
 }  // namespace webrtc