From 51cc30c12411ef8e3a64c91c17f748f3e83ae491 Mon Sep 17 00:00:00 2001 From: Qingsi Wang Date: Fri, 19 Oct 2018 11:10:16 -0700 Subject: [PATCH] Fix a null reference bug in NetworkMonitorAutoDetect.getNetworkState. Bug: webrtc:9168 Change-Id: Ib3e41db9ff347adfca3b12df6c0fd3293c8ea483 Reviewed-on: https://webrtc-review.googlesource.com/c/107220 Reviewed-by: Alex Glaznev Commit-Queue: Qingsi Wang Cr-Commit-Position: refs/heads/master@{#25279} --- sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java b/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java index 3d74f5fd7c..179f83d376 100644 --- a/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java +++ b/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java @@ -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()); }