zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add API level check for the use of ConnectivityManager.getActiveNetwork.

Browse Source 
This method is added in API level 23, and is currently used in
NetworkMonitorAutoDetect to determine the underlying type of a VPN
network.

Bug: webrtc:9811
Change-Id: I7277cd9adb5b3d3d9b116f667bf533352f9b3bdf
Reviewed-on: https://webrtc-review.googlesource.com/c/103560
Reviewed-by: Alex Glaznev <glaznev@webrtc.org>
Commit-Queue: Qingsi Wang <qingsi@google.com>
Cr-Commit-Position: refs/heads/master@{#24961}
This commit is contained in:
Qingsi Wang
2018-10-03 12:21:35 -07:00
committed by Commit Bot
parent cd18bf9522
commit 1bb63bb793
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
View File

@ -289,17 +289,21 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver {
//
// Note that getActiveNetwork and getActiveNetworkInfo return null if no default network is
// currently active.
if (networkInfo.getType() == ConnectivityManager.TYPE_VPN
&& network.equals(connectivityManager.getActiveNetwork())) {
// If a VPN network is in place, we can find the underlying network type via querying the
// active network info thanks to
// https://android.googlesource.com/platform/frameworks/base/+/d6a7980d
NetworkInfo underlyingActiveNetworkInfo = connectivityManager.getActiveNetworkInfo();
// We use the NetworkInfo of the underlying network if it is not of TYPE_VPN itself.
if (underlyingActiveNetworkInfo.getType() != ConnectivityManager.TYPE_VPN) {
return new NetworkState(networkInfo.isConnected(), ConnectivityManager.TYPE_VPN, -1,
underlyingActiveNetworkInfo.getType(), underlyingActiveNetworkInfo.getSubtype());
if (networkInfo.getType() == ConnectivityManager.TYPE_VPN) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
&& network.equals(connectivityManager.getActiveNetwork())) {
// If a VPN network is in place, we can find the underlying network type via querying the
// active network info thanks to
// https://android.googlesource.com/platform/frameworks/base/+/d6a7980d
NetworkInfo underlyingActiveNetworkInfo = connectivityManager.getActiveNetworkInfo();
// We use the NetworkInfo of the underlying network if it is not of TYPE_VPN itself.
if (underlyingActiveNetworkInfo.getType() != ConnectivityManager.TYPE_VPN) {
return new NetworkState(networkInfo.isConnected(), ConnectivityManager.TYPE_VPN, -1,
underlyingActiveNetworkInfo.getType(), underlyingActiveNetworkInfo.getSubtype());
}
}
return new NetworkState(
networkInfo.isConnected(), ConnectivityManager.TYPE_VPN, -1, -1, -1);
}
return getNetworkState(networkInfo);