mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-18 08:07:56 +01:00

This reverts commit 003c9be817
.
Reason for revert: Breaks downstream build which is still using
SetFactory/ReleaseFactory. Probably will need to update this in lockstep.
Original change's description:
> Pass NetworkMonitorFactory through PeerConnectionFactory.
>
> Previously the instance was set through a static method, which was
> really only done because it was difficult to add new
> PeerConnectionFactory construction arguments at the time.
>
> Now that we have PeerConnectionFactoryDependencies it's easy to clean
> this up.
>
> I'm doing this because I plan to add a NetworkMonitor implementation
> for iOS, and don't want to inherit this ugliness.
>
> Bug: webrtc:9883
> Change-Id: Id94dc061ab1c7186b81af8547393a6e336ff04c2
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180241
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
> Commit-Queue: Taylor <deadbeef@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#31815}
TBR=deadbeef@webrtc.org,sakal@webrtc.org,hta@webrtc.org
Change-Id: I1f09df7be9c860017d515e5a87488340afa6eda6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9883
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180640
Reviewed-by: Taylor <deadbeef@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31818}
36 lines
1.2 KiB
C++
36 lines
1.2 KiB
C++
/*
|
|
* Copyright 2018 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef SDK_ANDROID_NATIVE_API_BASE_NETWORK_MONITOR_H_
|
|
#define SDK_ANDROID_NATIVE_API_BASE_NETWORK_MONITOR_H_
|
|
|
|
#include <jni.h>
|
|
|
|
#include <memory>
|
|
|
|
#include "rtc_base/network_monitor.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Creates an Android-specific network monitor, which is capable of detecting
|
|
// network changes as soon as they occur, requesting a cellular interface
|
|
// (dependent on permissions), and binding sockets to network interfaces (more
|
|
// reliable than binding to IP addresses on Android).
|
|
std::unique_ptr<rtc::NetworkMonitorFactory> CreateAndroidNetworkMonitorFactory(
|
|
JNIEnv* env,
|
|
jobject application_context);
|
|
|
|
// Deprecated. Pass in application context instead.
|
|
std::unique_ptr<rtc::NetworkMonitorFactory>
|
|
CreateAndroidNetworkMonitorFactory();
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // SDK_ANDROID_NATIVE_API_BASE_NETWORK_MONITOR_H_
|