zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup old suppressions from suppressions.xml.

Browse Source 
Limits CpuMonitor to supported Android versions.

Bug: webrtc:6597
Change-Id: I15fb4f5dff2511f578069dd70521728e9909bd15
Reviewed-on: https://webrtc-review.googlesource.com/21225
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20626}
This commit is contained in:
Sami Kalliomäki
2017-11-08 16:02:21 +01:00
committed by Commit Bot
parent 6d85252e9e
commit ec6cf2a94f
4 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/androidapp/src/org/appspot/apprtc/CallActivity.java
View File

@ -364,8 +364,10 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven
new RoomConnectionParameters(roomUri.toString(), roomId, loopback, urlParameters);
// Create CPU monitor
cpuMonitor = new CpuMonitor(this);
hudFragment.setCpuMonitor(cpuMonitor);
if (cpuMonitor.isSupported()) {
cpuMonitor = new CpuMonitor(this);
hudFragment.setCpuMonitor(cpuMonitor);
}
// Send intent arguments to fragments.
callFragment.setArguments(intent.getExtras());
@ -502,7 +504,9 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven
if (peerConnectionClient != null && !screencaptureEnabled) {
peerConnectionClient.stopVideoSource();
}
cpuMonitor.pause();
if (cpuMonitor != null) {
cpuMonitor.pause();
}
}
@Override
@ -513,7 +517,9 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven
if (peerConnectionClient != null && !screencaptureEnabled) {
peerConnectionClient.startVideoSource();
}
cpuMonitor.resume();
if (cpuMonitor != null) {
cpuMonitor.resume();
}
}
@Override