commit 6aa95117d8d6270d8ef4da8b33cbdd67b4043ba8
author bdodson <bdodson@google.com> Wed Jul 05 16:55:09 2017
committer Commit Bot <commit-bot@chromium.org> Wed Jul 05 16:55:09 2017
tree 3c186dada148ed63b463b331e1e55ffb7636a182
parent e4f63a1929615825c065f801955440acc4ef4b05

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}

webrtc/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java

diff --git a/webrtc/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java b/webrtc/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
index 77b77be..9cae2ef 100644
--- a/webrtc/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
+++ b/webrtc/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
@@ -590,8 +590,13 @@
   }
 
   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());
     }