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

Fix a test bot failure.

Browse Source 
That was caused by https://codereview.webrtc.org/1581903002/

BUG=
R=pthatcher@google.com
TBR=pthatcher@webrtc.org

Review URL: https://codereview.webrtc.org/1587373002 .

Cr-Commit-Position: refs/heads/master@{#11260}
This commit is contained in:
Honghai Zhang
2016-01-14 15:56:26 -08:00
parent e1f9d837ae
commit 20ac434010
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
talk/app/webrtc/java/jni/peerconnection_jni.cc
View File

@ -1352,6 +1352,16 @@ JOW(void, PeerConnectionFactory_nativeSetOptions)(
PeerConnectionFactoryInterface::Options options_to_set =
ParseOptionsFromJava(jni, options);
factory->SetOptions(options_to_set);
if (options_to_set.disable_network_monitor) {
OwnedFactoryAndThreads* owner =
reinterpret_cast<OwnedFactoryAndThreads*>(native_factory);
if (owner->network_monitor_factory()) {
rtc::NetworkMonitorFactory::ReleaseFactory(
owner->network_monitor_factory());
owner->clear_network_monitor_factory();
}
}
}
JOW(void, PeerConnectionFactory_nativeSetVideoHwAccelerationOptions)(