Update the type and cost of existing networks if its type is found later by network monitor

webrtc/api/java/jni/androidnetworkmonitor_jni.cc

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..aa6d9ce69453769e8bbe25dee0c695ad93a69ec3 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 the NetworksChangedSignal to update the list of networks.

[pthatcher1, 2016/05/17 21:23:11]

Do you mean SignalNetworksChanged?

[honghaiz3, 2016/05/18 07:41:46]

Ah Yes.

+  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 finds " << network_infos.size()

[pthatcher1, 2016/05/17 21:23:11]

finds => found

[honghaiz3, 2016/05/18 07:41:46]

Done.

+               << " 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*