Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Unified Diff: talk/app/webrtc/java/android/org/webrtc/NetworkMonitor.java

Issue 1556743002: Bind a socket to a network if the network handle is set. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix a compiling issue for Windows Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: talk/app/webrtc/java/android/org/webrtc/NetworkMonitor.java
diff --git a/talk/app/webrtc/java/android/org/webrtc/NetworkMonitor.java b/talk/app/webrtc/java/android/org/webrtc/NetworkMonitor.java
index 581a223c19026c976c7e784e6b8bac019d556196..4e64e5194978512b46dd2b65fcaf3a3f091a7696 100644
--- a/talk/app/webrtc/java/android/org/webrtc/NetworkMonitor.java
+++ b/talk/app/webrtc/java/android/org/webrtc/NetworkMonitor.java
@@ -29,6 +29,7 @@ package org.webrtc;
import static org.webrtc.NetworkMonitorAutoDetect.ConnectionType;
import static org.webrtc.NetworkMonitorAutoDetect.INVALID_NET_ID;
+import static org.webrtc.NetworkMonitorAutoDetect.NetworkInformation;
import android.content.Context;
import android.util.Log;
@@ -156,11 +157,14 @@ public class NetworkMonitor {
public void onConnectionTypeChanged(ConnectionType newConnectionType) {
updateCurrentConnectionType(newConnectionType);
}
+ public void onNetworkConnect(NetworkInformation networkInfo) {
+ updateNetworkInformation(networkInfo);
+ }
},
applicationContext);
final NetworkMonitorAutoDetect.NetworkState networkState =
autoDetector.getCurrentNetworkState();
- updateCurrentConnectionType(autoDetector.getCurrentConnectionType(networkState));
+ updateCurrentConnectionType(autoDetector.getConnectionType(networkState));
}
}
@@ -181,6 +185,12 @@ public class NetworkMonitor {
}
}
+ private void updateNetworkInformation(NetworkInformation networkInfo) {
+ for (long nativeObserver : nativeNetworkObservers) {
+ nativeNotifyOfNetworkConnect(nativeObserver, networkInfo);
+ }
+ }
+
/**
* Adds an observer for any connection type changes.
*/
@@ -216,6 +226,8 @@ public class NetworkMonitor {
private native void nativeNotifyConnectionTypeChanged(long nativePtr);
+ private native void nativeNotifyOfNetworkConnect(long nativePtr, NetworkInformation networkInfo);
+
// For testing only.
static void resetInstanceForTests(Context context) {
instance = new NetworkMonitor(context);

Powered by Google App Engine
This is Rietveld 408576698