| Index: webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc
|
| diff --git a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc b/webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc
|
| similarity index 96%
|
| rename from webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc
|
| rename to webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc
|
| index 19f9b303ffd92a89a5fbbf74dbf3bfc1573c6b8b..383326f7882df5b7ff3e56d64f91ab95308ba729 100644
|
| --- a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc
|
| +++ b/webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc
|
| @@ -8,7 +8,7 @@
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -#include "webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h"
|
| +#include "webrtc/sdk/android/src/jni/pc/androidnetworkmonitor_jni.h"
|
|
|
| #include <dlfcn.h>
|
| // This was added in Lollipop to dlfcn.h
|
| @@ -389,16 +389,18 @@ AndroidNetworkMonitorFactory::CreateNetworkMonitor() {
|
| return new AndroidNetworkMonitor();
|
| }
|
|
|
| -JOW(void, NetworkMonitor_nativeNotifyConnectionTypeChanged)(
|
| - JNIEnv* jni, jobject j_monitor, jlong j_native_monitor) {
|
| +JOW(void, NetworkMonitor_nativeNotifyConnectionTypeChanged)
|
| +(JNIEnv* jni, jobject j_monitor, jlong j_native_monitor) {
|
| rtc::NetworkMonitorInterface* network_monitor =
|
| reinterpret_cast<rtc::NetworkMonitorInterface*>(j_native_monitor);
|
| network_monitor->OnNetworksChanged();
|
| }
|
|
|
| -JOW(void, NetworkMonitor_nativeNotifyOfActiveNetworkList)(
|
| - JNIEnv* jni, jobject j_monitor, jlong j_native_monitor,
|
| - jobjectArray j_network_infos) {
|
| +JOW(void, NetworkMonitor_nativeNotifyOfActiveNetworkList)
|
| +(JNIEnv* jni,
|
| + jobject j_monitor,
|
| + jlong j_native_monitor,
|
| + jobjectArray j_network_infos) {
|
| AndroidNetworkMonitor* network_monitor =
|
| reinterpret_cast<AndroidNetworkMonitor*>(j_native_monitor);
|
| std::vector<NetworkInformation> network_infos;
|
| @@ -411,9 +413,11 @@ JOW(void, NetworkMonitor_nativeNotifyOfActiveNetworkList)(
|
| network_monitor->SetNetworkInfos(network_infos);
|
| }
|
|
|
| -JOW(void, NetworkMonitor_nativeNotifyOfNetworkConnect)(
|
| - JNIEnv* jni, jobject j_monitor, jlong j_native_monitor,
|
| - jobject j_network_info) {
|
| +JOW(void, NetworkMonitor_nativeNotifyOfNetworkConnect)
|
| +(JNIEnv* jni,
|
| + jobject j_monitor,
|
| + jlong j_native_monitor,
|
| + jobject j_network_info) {
|
| AndroidNetworkMonitor* network_monitor =
|
| reinterpret_cast<AndroidNetworkMonitor*>(j_native_monitor);
|
| NetworkInformation network_info =
|
| @@ -421,9 +425,8 @@ JOW(void, NetworkMonitor_nativeNotifyOfNetworkConnect)(
|
| network_monitor->OnNetworkConnected(network_info);
|
| }
|
|
|
| -JOW(void, NetworkMonitor_nativeNotifyOfNetworkDisconnect)(
|
| - JNIEnv* jni, jobject j_monitor, jlong j_native_monitor,
|
| - jlong network_handle) {
|
| +JOW(void, NetworkMonitor_nativeNotifyOfNetworkDisconnect)
|
| +(JNIEnv* jni, jobject j_monitor, jlong j_native_monitor, jlong network_handle) {
|
| AndroidNetworkMonitor* network_monitor =
|
| reinterpret_cast<AndroidNetworkMonitor*>(j_native_monitor);
|
| network_monitor->OnNetworkDisconnected(
|
|
|