diff options
| author | fischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-04-28 16:32:38 +0000 |
|---|---|---|
| committer | fischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-04-28 16:32:38 +0000 |
| commit | 3706881219b3b2bdad4a4bc4757c68b4e53b0690 (patch) | |
| tree | f6d00d22405744ec172318986e1d771d286fbb5e /examples | |
| parent | cac39d79c61db2abbff494a389356d4f60ee7753 (diff) | |
| download | talk-3706881219b3b2bdad4a4bc4757c68b4e53b0690.tar.gz | |
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/talk@6001 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java b/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java index 3cf05d8..38ab0c3 100644 --- a/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java +++ b/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)); |