Add UNKNOWN_CELLULAR network type and allow unknown network type in NetworkMonitor

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 26 matching lines @@
   }
   if (enum_name == "CONNECTION_4G") {
     return NetworkType::NETWORK_4G;
   }
   if (enum_name == "CONNECTION_3G") {
     return NetworkType::NETWORK_3G;
   }
   if (enum_name == "CONNECTION_2G") {
     return NetworkType::NETWORK_2G;
   }
+  if (enum_name == "CONNECTION_UNKNOWN_CELLULAR") {
+    return NetworkType::NETWORK_UNKNOWN_CELLULAR;
+  }
   if (enum_name == "CONNECTION_BLUETOOTH") {
     return NetworkType::NETWORK_BLUETOOTH;
   }
   if (enum_name == "CONNECTION_NONE") {
     return NetworkType::NETWORK_NONE;
   }
   ASSERT(false);
   return NetworkType::NETWORK_UNKNOWN;
 }
 
 static rtc::AdapterType AdapterTypeFromNetworkType(NetworkType network_type) {
   switch (network_type) {
     case NETWORK_UNKNOWN:
-      RTC_DCHECK(false) << "Unknown network type";
       return rtc::ADAPTER_TYPE_UNKNOWN;
     case NETWORK_ETHERNET:
       return rtc::ADAPTER_TYPE_ETHERNET;
     case NETWORK_WIFI:
       return rtc::ADAPTER_TYPE_WIFI;
     case NETWORK_4G:
     case NETWORK_3G:
     case NETWORK_2G:
+    case NETWORK_UNKNOWN_CELLULAR:
       return rtc::ADAPTER_TYPE_CELLULAR;
     case NETWORK_BLUETOOTH:
       // There is no corresponding mapping for bluetooth networks.
       // Map it to VPN for now.
       return rtc::ADAPTER_TYPE_VPN;
     default:
       RTC_DCHECK(false) << "Invalid network type " << network_type;
       return rtc::ADAPTER_TYPE_UNKNOWN;
   }
 }
@@ skipping 288 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