d34a711f22
Reason for revert: Issues fixed Original issue's description: > Revert of Combine webrtc/api/java/android and webrtc/api/java/src. (patchset #1 id:1 of https://codereview.webrtc.org/2111823002/ ) > > Reason for revert: > Breaks downstream dependencies > > Original issue's description: > > Combine webrtc/api/java/android and webrtc/api/java/src. > > > > It used to be that there was a Java api for devices not running Android > > but that is no longer the case. I combined the directories and made > > the folder structure chromium style. > > > > BUG=webrtc:6067 > > R=magjed@webrtc.org, tommi@webrtc.org > > > > Committed:ceefe20dd6> > TBR=magjed@webrtc.org,tommi@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6067 > > Committed:9b0dc622d4TBR=magjed@webrtc.org,tommi@webrtc.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6067 Review-Url: https://codereview.webrtc.org/2111923003 Cr-Commit-Position: refs/heads/master@{#13363}
93 lines
2.8 KiB
C++
93 lines
2.8 KiB
C++
/*
|
|
* Copyright 2015 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 WEBRTC_API_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_
|
|
#define WEBRTC_API_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_
|
|
|
|
#include "webrtc/base/networkmonitor.h"
|
|
|
|
#include <map>
|
|
|
|
#include "webrtc/api/android/jni/jni_helpers.h"
|
|
#include "webrtc/base/basictypes.h"
|
|
#include "webrtc/base/thread_checker.h"
|
|
|
|
namespace webrtc_jni {
|
|
|
|
typedef uint32_t NetworkHandle;
|
|
|
|
// c++ equivalent of java NetworkMonitorAutoDetect.ConnectionType.
|
|
enum NetworkType {
|
|
NETWORK_UNKNOWN,
|
|
NETWORK_ETHERNET,
|
|
NETWORK_WIFI,
|
|
NETWORK_4G,
|
|
NETWORK_3G,
|
|
NETWORK_2G,
|
|
NETWORK_UNKNOWN_CELLULAR,
|
|
NETWORK_BLUETOOTH,
|
|
NETWORK_NONE
|
|
};
|
|
|
|
// The information is collected from Android OS so that the native code can get
|
|
// the network type and handle (Android network ID) for each interface.
|
|
struct NetworkInformation {
|
|
std::string interface_name;
|
|
NetworkHandle handle;
|
|
NetworkType type;
|
|
std::vector<rtc::IPAddress> ip_addresses;
|
|
|
|
std::string ToString() const;
|
|
};
|
|
|
|
class AndroidNetworkMonitor : public rtc::NetworkMonitorBase,
|
|
public rtc::NetworkBinderInterface {
|
|
public:
|
|
AndroidNetworkMonitor();
|
|
|
|
static void SetAndroidContext(JNIEnv* jni, jobject context);
|
|
|
|
void Start() override;
|
|
void Stop() override;
|
|
|
|
int BindSocketToNetwork(int socket_fd,
|
|
const rtc::IPAddress& address) override;
|
|
rtc::AdapterType GetAdapterType(const std::string& if_name) override;
|
|
void OnNetworkConnected(const NetworkInformation& network_info);
|
|
void OnNetworkDisconnected(NetworkHandle network_handle);
|
|
void SetNetworkInfos(const std::vector<NetworkInformation>& network_infos);
|
|
|
|
private:
|
|
JNIEnv* jni() { return AttachCurrentThreadIfNeeded(); }
|
|
|
|
void OnNetworkConnected_w(const NetworkInformation& network_info);
|
|
void OnNetworkDisconnected_w(NetworkHandle network_handle);
|
|
|
|
ScopedGlobalRef<jclass> j_network_monitor_class_;
|
|
ScopedGlobalRef<jobject> j_network_monitor_;
|
|
rtc::ThreadChecker thread_checker_;
|
|
static jobject application_context_;
|
|
bool started_ = false;
|
|
std::map<std::string, rtc::AdapterType> adapter_type_by_name_;
|
|
std::map<rtc::IPAddress, NetworkHandle> network_handle_by_address_;
|
|
std::map<NetworkHandle, NetworkInformation> network_info_by_handle_;
|
|
};
|
|
|
|
class AndroidNetworkMonitorFactory : public rtc::NetworkMonitorFactory {
|
|
public:
|
|
AndroidNetworkMonitorFactory() {}
|
|
|
|
rtc::NetworkMonitorInterface* CreateNetworkMonitor() override;
|
|
};
|
|
|
|
} // namespace webrtc_jni
|
|
|
|
#endif // WEBRTC_API_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_
|