webrtc/api/android/jni/androidnetworkmonitor_jni.h - Issue 2189753002: Use a newer method to bind socket to network in Android M and later.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/api/android/jni/androidnetworkmonitor_jni.h

Issue 2189753002: Use a newer method to bind socket to network in Android M and later. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Fix a test Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/api/android/java/src/org/webrtc/NetworkMonitorAutoDetect.java ('k') | webrtc/api/android/jni/androidnetworkmonitor_jni.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/api/android/jni/androidnetworkmonitor_jni.h

diff --git a/webrtc/api/android/jni/androidnetworkmonitor_jni.h b/webrtc/api/android/jni/androidnetworkmonitor_jni.h

index c8d7fcde5bdfb412b22391d2456a6dc33b32dc6e..f164986effad28c01a0d2eb14ccd8b7977e869aa 100644

--- a/webrtc/api/android/jni/androidnetworkmonitor_jni.h

+++ b/webrtc/api/android/jni/androidnetworkmonitor_jni.h

@@ -21,7 +21,7 @@

namespace webrtc_jni {

-typedef uint32_t NetworkHandle;

+typedef long NetworkHandle;

// c++ equivalent of java NetworkMonitorAutoDetect.ConnectionType.

enum NetworkType {

@@ -65,6 +65,8 @@ class AndroidNetworkMonitor : public rtc::NetworkMonitorBase,

void SetNetworkInfos(const std::vector<NetworkInformation>& network_infos);

private:

+ static jobject application_context_;

+ static int android_sdk_int_;

JNIEnv* jni() { return AttachCurrentThreadIfNeeded(); }

void OnNetworkConnected_w(const NetworkInformation& network_info);

@@ -73,7 +75,6 @@ class AndroidNetworkMonitor : public rtc::NetworkMonitorBase,

ScopedGlobalRef<jclass> j_network_monitor_class_;

ScopedGlobalRef<jobject> j_network_monitor_;

rtc::ThreadChecker thread_checker_;

- static jobject application_context_;

bool started_ = false;

std::map<std::string, rtc::AdapterType> adapter_type_by_name_;

std::map<rtc::IPAddress, NetworkHandle> network_handle_by_address_;