Return "not implemented" error from BindSocketToNetwork properly.

webrtc/sdk/android/src/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 222 matching lines @@
   network_handle_by_address_.clear();
   network_info_by_handle_.clear();
 }
 
 // The implementation is largely taken from UDPSocketPosix::BindToNetwork in
 // https://cs.chromium.org/chromium/src/net/udp/udp_socket_posix.cc
 rtc::NetworkBindingResult AndroidNetworkMonitor::BindSocketToNetwork(
     int socket_fd,
     const rtc::IPAddress& address) {
   RTC_CHECK(thread_checker_.CalledOnValidThread());
+
+  jmethodID network_binding_supported_id = GetMethodID(
+      jni(), *j_network_monitor_class_, "networkBindingSupported", "()Z");
   // Android prior to Lollipop didn't have support for binding sockets to
-  // networks. In that case it should not have reached here because
-  // |network_handle_by_address_| is only populated in Android Lollipop
-  // and above.
-  if (android_sdk_int_ < SDK_VERSION_LOLLIPOP) {
-    LOG(LS_ERROR) << "BindSocketToNetwork is not supported in Android SDK "
-                  << android_sdk_int_;
+  // networks. This may also occur if there is no connectivity manager service.
+  if (!jni()->CallBooleanMethod(*j_network_monitor_,

[magjed_webrtc, 2017/02/15 12:27:26]

Maybe you should add a CHECK_EXCEPTION(jni()) after this.

[Taylor Brandstetter, 2017/02/15 18:32:24]

Done.

+                                network_binding_supported_id)) {
+    LOG(LS_WARNING) << "BindSocketToNetwork is not supported on this platform "
+                    << "(Android SDK: " << android_sdk_int_ << ")";
     return rtc::NetworkBindingResult::NOT_IMPLEMENTED;
   }
 
   auto iter = network_handle_by_address_.find(address);
   if (iter == network_handle_by_address_.end()) {
     return rtc::NetworkBindingResult::ADDRESS_NOT_FOUND;
   }
   NetworkHandle network_handle = iter->second;
 
   int rv = 0;
@@ skipping 167 matching lines @@
 JOW(void, NetworkMonitor_nativeNotifyOfNetworkDisconnect)(
     JNIEnv* jni, jobject j_monitor, jlong j_native_monitor,
     jlong network_handle) {
   AndroidNetworkMonitor* network_monitor =
       reinterpret_cast<AndroidNetworkMonitor*>(j_native_monitor);
   network_monitor->OnNetworkDisconnected(
       static_cast<NetworkHandle>(network_handle));
 }
 
 }  // namespace webrtc_jni