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

Unified Diff: webrtc/api/java/jni/androidnetworkmonitor_jni.cc

Issue 1976683003: Update the type and cost of existing networks if its type is found later by network monitor (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Minor changes Created 4 years, 7 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
« no previous file with comments | « no previous file | webrtc/api/webrtcsdp.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/java/jni/androidnetworkmonitor_jni.cc
diff --git a/webrtc/api/java/jni/androidnetworkmonitor_jni.cc b/webrtc/api/java/jni/androidnetworkmonitor_jni.cc
index 6362764fccc600f2ce79343839f165a45bb33c01..b7857e2ea96355c26ab1842d402992f3d59ea7d2 100644
--- a/webrtc/api/java/jni/androidnetworkmonitor_jni.cc
+++ b/webrtc/api/java/jni/androidnetworkmonitor_jni.cc
@@ -268,13 +268,15 @@ int AndroidNetworkMonitor::BindSocketToNetwork(int socket_fd,
void AndroidNetworkMonitor::OnNetworkConnected(
const NetworkInformation& network_info) {
- LOG(LS_INFO) << "Network connected: " << network_info.ToString();
worker_thread()->Invoke<void>(rtc::Bind(
&AndroidNetworkMonitor::OnNetworkConnected_w, this, network_info));
+ // Fire SignalNetworksChanged to update the list of networks.
+ OnNetworksChanged();
}
void AndroidNetworkMonitor::OnNetworkConnected_w(
const NetworkInformation& network_info) {
+ LOG(LS_INFO) << "Network connected: " << network_info.ToString();
adapter_type_by_name_[network_info.interface_name] =
AdapterTypeFromNetworkType(network_info.type);
network_info_by_handle_[network_info.handle] = network_info;
@@ -304,6 +306,8 @@ void AndroidNetworkMonitor::SetNetworkInfos(
RTC_CHECK(thread_checker_.CalledOnValidThread());
network_handle_by_address_.clear();
network_info_by_handle_.clear();
+ LOG(LS_INFO) << "Android network monitor found " << network_infos.size()
+ << " networks";
for (NetworkInformation network : network_infos) {
OnNetworkConnected_w(network);
}
@@ -312,11 +316,13 @@ void AndroidNetworkMonitor::SetNetworkInfos(
rtc::AdapterType AndroidNetworkMonitor::GetAdapterType(
const std::string& if_name) {
auto iter = adapter_type_by_name_.find(if_name);
- if (iter == adapter_type_by_name_.end()) {
- LOG(LS_WARNING) << "Get adapter type for an unknown interface: " << if_name;
- return rtc::ADAPTER_TYPE_UNKNOWN;
+ rtc::AdapterType type = (iter == adapter_type_by_name_.end())
+ ? rtc::ADAPTER_TYPE_UNKNOWN
+ : iter->second;
+ if (type == rtc::ADAPTER_TYPE_UNKNOWN) {
+ LOG(LS_WARNING) << "Get an unknown type for the interface " << if_name;
}
- return iter->second;
+ return type;
}
rtc::NetworkMonitorInterface*
« no previous file with comments | « no previous file | webrtc/api/webrtcsdp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698