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..4227e4d32c81d28b5c34f744f560baae7db638d7 100644 |
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java |
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java |
@@ -13,7 +13,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; |
@@ -30,6 +29,7 @@ import android.view.Window; |
import android.view.WindowManager.LayoutParams; |
import android.widget.Toast; |
+import org.appspot.apprtc.util.LooperExecutor; |
magjed_webrtc
2016/05/19 12:07:54
Move this import back to the other org.appspot.app
sakal
2016/05/19 12:39:03
Done.
|
import org.webrtc.EglBase; |
import org.webrtc.IceCandidate; |
import org.webrtc.PeerConnectionFactory; |
@@ -38,6 +38,8 @@ import org.webrtc.StatsReport; |
import org.webrtc.RendererCommon.ScalingType; |
import org.webrtc.SurfaceViewRenderer; |
+import java.util.concurrent.Executors; |
magjed_webrtc
2016/05/19 12:07:54
not used?
sakal
2016/05/19 12:39:03
Done.
|
+ |
/** |
* Activity for peer connection call setup, call waiting |
* and call view. |
@@ -245,7 +247,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 +316,6 @@ public class CallActivity extends Activity |
} |
activityRunning = false; |
rootEglBase.release(); |
- if (cpuMonitor != null) { |
- cpuMonitor.release(); |
magjed_webrtc
2016/05/19 12:07:54
don't we need to shut down the ExecutorService?
sakal
2016/05/19 12:39:03
In the new implementation, the executor is already
|
- } |
super.onDestroy(); |
} |