From 6aa95117d8d6270d8ef4da8b33cbdd67b4043ba8 Mon Sep 17 00:00:00 2001
From: bdodson <bdodson@google.com>
Date: Wed, 5 Jul 2017 09:55:09 -0700
Subject: [PATCH] Fix null ref in NetworkMonitorAutoDetect if Connectivity
 Manager service is unavailable

BUG=webrtc:7917
TBR=magjed@webrtc.org

Review-Url: https://codereview.webrtc.org/2963363002
Cr-Commit-Position: refs/heads/master@{#18906}
---
 .../android/api/org/webrtc/NetworkMonitorAutoDetect.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/webrtc/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java b/webrtc/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
index 77b77be95c..9cae2ef331 100644
--- a/webrtc/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
+++ b/webrtc/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
@@ -590,8 +590,13 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver {
   }
 
   List<NetworkInformation> getActiveNetworkList() {
+    List<NetworkInformation> connectivityManagerList =
+        connectivityManagerDelegate.getActiveNetworkList();
+    if (connectivityManagerList == null) {
+      return null;
+    }
     ArrayList<NetworkInformation> result =
-        new ArrayList<NetworkInformation>(connectivityManagerDelegate.getActiveNetworkList());
+        new ArrayList<NetworkInformation>(connectivityManagerList);
     if (wifiDirectManagerDelegate != null) {
       result.addAll(wifiDirectManagerDelegate.getActiveNetworkList());
     }