From f27fdeb9c906ba80a10f3638a28b73a757fcef3f Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Mon, 28 Apr 2014 16:32:38 +0000 Subject: [PATCH] AppRTCDemo(android): don't initialize process-globals more than once. BUG=3257 R=braveyao@webrtc.org Review URL: https://webrtc-codereview.appspot.com/19369004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6001 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../android/src/org/appspot/apprtc/AppRTCDemoActivity.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/talk/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java b/talk/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java index 3cf05d80be..38ab0c3ee7 100644 --- a/talk/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java +++ b/talk/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java @@ -73,6 +73,7 @@ import java.util.regex.Pattern; public class AppRTCDemoActivity extends Activity implements AppRTCClient.IceServersObserver { private static final String TAG = "AppRTCDemoActivity"; + private static boolean factoryStaticInitialized; private PeerConnectionFactory factory; private VideoSource videoSource; private boolean videoSourceStopped; @@ -104,8 +105,11 @@ public class AppRTCDemoActivity extends Activity vsv = new VideoStreamsView(this, displaySize); setContentView(vsv); - abortUnless(PeerConnectionFactory.initializeAndroidGlobals(this), + if (!factoryStaticInitialized) { + abortUnless(PeerConnectionFactory.initializeAndroidGlobals(this), "Failed to initializeAndroidGlobals"); + factoryStaticInitialized = true; + } AudioManager audioManager = ((AudioManager) getSystemService(AUDIO_SERVICE));