| Index: webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
|
| diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
|
| index 9109383f4531db48d64cc78d2143291dba4f75da..7447d059bff38b392fed1d723e40a3503cef2596 100644
|
| --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
|
| +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
|
| @@ -10,11 +10,6 @@
|
|
|
| package org.appspot.apprtc;
|
|
|
| -import org.appspot.apprtc.AppRTCClient.RoomConnectionParameters;
|
| -import org.appspot.apprtc.AppRTCClient.SignalingParameters;
|
| -import org.appspot.apprtc.PeerConnectionClient.PeerConnectionParameters;
|
| -import org.appspot.apprtc.util.LooperExecutor;
|
| -
|
| import android.app.Activity;
|
| import android.app.AlertDialog;
|
| import android.app.FragmentTransaction;
|
| @@ -30,12 +25,16 @@ import android.view.Window;
|
| import android.view.WindowManager.LayoutParams;
|
| import android.widget.Toast;
|
|
|
| +import org.appspot.apprtc.AppRTCClient.RoomConnectionParameters;
|
| +import org.appspot.apprtc.AppRTCClient.SignalingParameters;
|
| +import org.appspot.apprtc.PeerConnectionClient.PeerConnectionParameters;
|
| +import org.appspot.apprtc.util.LooperExecutor;
|
| import org.webrtc.EglBase;
|
| import org.webrtc.IceCandidate;
|
| import org.webrtc.PeerConnectionFactory;
|
| +import org.webrtc.RendererCommon.ScalingType;
|
| import org.webrtc.SessionDescription;
|
| import org.webrtc.StatsReport;
|
| -import org.webrtc.RendererCommon.ScalingType;
|
| import org.webrtc.SurfaceViewRenderer;
|
|
|
| /**
|
| @@ -245,7 +244,7 @@ public class CallActivity extends Activity
|
| appRtcClient = new WebSocketRTCClient(this, new LooperExecutor());
|
| } else {
|
| Log.i(TAG, "Using DirectRTCClient because room name looks like an IP.");
|
| - appRtcClient = new DirectRTCClient(this, new LooperExecutor());
|
| + appRtcClient = new DirectRTCClient(this);
|
| }
|
| // Create connection parameters.
|
| roomConnectionParameters = new RoomConnectionParameters(
|
| @@ -314,9 +313,6 @@ public class CallActivity extends Activity
|
| }
|
| activityRunning = false;
|
| rootEglBase.release();
|
| - if (cpuMonitor != null) {
|
| - cpuMonitor.release();
|
| - }
|
| super.onDestroy();
|
| }
|
|
|
|
|