commit ead202b973ba2d74e0a7a25e0d21ad7a67c4c801
author henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Jan 16 23:26:37 2014
committer henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Jan 16 23:26:37 2014
tree 8221bec66869f153685df9ecda06840d9dcd0741
parent 2ce9a64b75929bd6c94f8f151d00cd82f41a1bc7

Android, OpenSlDemo: fixes issue where app would crash as soon as the application is started.

BUG=2801
R=fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/7259005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5398 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/audio_device/android/test/jni/opensl_runner.cc

diff --git a/webrtc/modules/audio_device/android/test/jni/opensl_runner.cc b/webrtc/modules/audio_device/android/test/jni/opensl_runner.cc
index cd1b19c..9d01330 100644
--- a/webrtc/modules/audio_device/android/test/jni/opensl_runner.cc
+++ b/webrtc/modules/audio_device/android/test/jni/opensl_runner.cc
@@ -63,14 +63,6 @@
     audio_buffer_.ClearBuffer();
   }
 
-  void RegisterApplicationContext(
-      JNIEnv* env,
-      jobject obj,
-      jobject context) {
-    OutputType::SetAndroidAudioDeviceObjects(env, obj, context);
-    InputType::SetAndroidAudioDeviceObjects(env, obj, context);
-  }
-
  private:
   OutputType output_;
   InputType input_;
@@ -92,6 +84,10 @@
       jobject obj,
       jobject context) {
     assert(!g_runner);  // Should only be called once.
+    // Register the application context in the superclass to avoid having to
+    // qualify the template instantiation again.
+    OpenSlesInput::SetAndroidAudioDeviceObjects(g_vm, env, context);
+    OpenSlesOutput::SetAndroidAudioDeviceObjects(g_vm, env, context);
     g_runner = new OpenSlRunner();
   }