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

Fix a null reference bug in NetworkMonitorAutoDetect.getNetworkState.

Browse Source 
Bug: webrtc:9168
Change-Id: Ib3e41db9ff347adfca3b12df6c0fd3293c8ea483
Reviewed-on: https://webrtc-review.googlesource.com/c/107220
Reviewed-by: Alex Glaznev <glaznev@webrtc.org>
Commit-Queue: Qingsi Wang <qingsi@google.com>
Cr-Commit-Position: refs/heads/master@{#25279}
This commit is contained in:
Qingsi Wang
2018-10-19 11:10:16 -07:00
committed by Commit Bot
parent cb21ffe899
commit 51cc30c124
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,7 +297,8 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver {
// 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) {
if (underlyingActiveNetworkInfo != null
&& underlyingActiveNetworkInfo.getType() != ConnectivityManager.TYPE_VPN) {
return new NetworkState(networkInfo.isConnected(), ConnectivityManager.TYPE_VPN, -1,
underlyingActiveNetworkInfo.getType(), underlyingActiveNetworkInfo.getSubtype());
}