From 20ac43401036e57f0197a06037dd8a4ce98a47c6 Mon Sep 17 00:00:00 2001 From: Honghai Zhang Date: Thu, 14 Jan 2016 15:56:26 -0800 Subject: [PATCH] Fix a test bot failure. 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} --- talk/app/webrtc/java/jni/peerconnection_jni.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc index cbc33c45d6..eea5fbd841 100644 --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc @@ -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(native_factory); + if (owner->network_monitor_factory()) { + rtc::NetworkMonitorFactory::ReleaseFactory( + owner->network_monitor_factory()); + owner->clear_network_monitor_factory(); + } + } } JOW(void, PeerConnectionFactory_nativeSetVideoHwAccelerationOptions)(