diff --git a/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc b/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc index 662f6cb9c5..a48b3df186 100644 --- a/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc +++ b/sdk/android/src/jni/pc/androidnetworkmonitor_jni.cc @@ -230,10 +230,6 @@ rtc::NetworkBindingResult AndroidNetworkMonitor::BindSocketToNetwork( const rtc::IPAddress& address) { RTC_CHECK(thread_checker_.CalledOnValidThread()); - if (socket_fd == 0 /* NETWORK_UNSPECIFIED */) { - return rtc::NetworkBindingResult::NOT_IMPLEMENTED; - } - 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 @@ -254,6 +250,10 @@ rtc::NetworkBindingResult AndroidNetworkMonitor::BindSocketToNetwork( } NetworkHandle network_handle = iter->second; + if (network_handle == 0 /* NETWORK_UNSPECIFIED */) { + return rtc::NetworkBindingResult::NOT_IMPLEMENTED; + } + int rv = 0; if (android_sdk_int_ >= SDK_VERSION_MARSHMALLOW) { // See declaration of android_setsocknetwork() here: