generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AppRTCDemo(android): don't initialize process-globals more than once.

Browse Source 
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
This commit is contained in:
fischman@webrtc.org 2014-04-28 16:32:38 +00:00
parent 497ff21fad
commit f27fdeb9c9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
talk/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java
View File

@ -73,6 +73,7 @@ import java.util.regex.Pattern;
public class AppRTCDemoActivity extends Activity public class AppRTCDemoActivity extends Activity
implements AppRTCClient.IceServersObserver { implements AppRTCClient.IceServersObserver {
private static final String TAG = "AppRTCDemoActivity"; private static final String TAG = "AppRTCDemoActivity";
private static boolean factoryStaticInitialized;
private PeerConnectionFactory factory; private PeerConnectionFactory factory;
private VideoSource videoSource; private VideoSource videoSource;
private boolean videoSourceStopped; private boolean videoSourceStopped;
@ -104,8 +105,11 @@ public class AppRTCDemoActivity extends Activity
vsv = new VideoStreamsView(this, displaySize); vsv = new VideoStreamsView(this, displaySize);
setContentView(vsv); setContentView(vsv);
abortUnless(PeerConnectionFactory.initializeAndroidGlobals(this), if (!factoryStaticInitialized) {
abortUnless(PeerConnectionFactory.initializeAndroidGlobals(this),
"Failed to initializeAndroidGlobals"); "Failed to initializeAndroidGlobals");
factoryStaticInitialized = true;
}
AudioManager audioManager = AudioManager audioManager =
((AudioManager) getSystemService(AUDIO_SERVICE)); ((AudioManager) getSystemService(AUDIO_SERVICE));