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

webrtc/api/java/jni/androidnetworkmonitor_jni.cc

 /*
  *  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.
  */
 
@@ skipping 250 matching lines @@
     return rtc::NETWORK_BIND_SUCCESS;
   }
   if (rv == ENONET) {
     return rtc::NETWORK_BIND_NETWORK_CHANGED;
   }
   return rtc::NETWORK_BIND_FAILURE;
 }
 
 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;
   for (const rtc::IPAddress& address : network_info.ip_addresses) {
     network_handle_by_address_[address] = network_info.handle;
   }
 }
 
 void AndroidNetworkMonitor::OnNetworkDisconnected(NetworkHandle handle) {
   LOG(LS_INFO) << "Network disconnected for handle " << handle;
   worker_thread()->Invoke<void>(
       rtc::Bind(&AndroidNetworkMonitor::OnNetworkDisconnected_w, this, handle));
 }
 
 void AndroidNetworkMonitor::OnNetworkDisconnected_w(NetworkHandle handle) {
   auto iter = network_info_by_handle_.find(handle);
   if (iter != network_info_by_handle_.end()) {
     for (const rtc::IPAddress& address : iter->second.ip_addresses) {
       network_handle_by_address_.erase(address);
     }
     network_info_by_handle_.erase(iter);
   }
 }
 
 void AndroidNetworkMonitor::SetNetworkInfos(
     const std::vector<NetworkInformation>& network_infos) {
   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);
   }
 }
 
 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*
 AndroidNetworkMonitorFactory::CreateNetworkMonitor() {
   return new AndroidNetworkMonitor();
 }
 
 JOW(void, NetworkMonitor_nativeNotifyConnectionTypeChanged)(
     JNIEnv* jni, jobject j_monitor, jlong j_native_monitor) {
   rtc::NetworkMonitorInterface* network_monitor =
@@ skipping 29 matching lines @@
 JOW(void, NetworkMonitor_nativeNotifyOfNetworkDisconnect)(
     JNIEnv* jni, jobject j_monitor, jlong j_native_monitor,
     jint network_handle) {
   AndroidNetworkMonitor* network_monitor =
       reinterpret_cast<AndroidNetworkMonitor*>(j_native_monitor);
   network_monitor->OnNetworkDisconnected(
       static_cast<NetworkHandle>(network_handle));
 }
 
 }  // namespace webrtc_jni