Chromium Code Reviews| Index: 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 77b77be95c1d7a5ea3eee900acff56d09a028c2a..9cae2ef33117767be360f593ded696ea0974a805 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; |
|
magjed_webrtc
2017/07/07 11:49:07
Shouldn't we still add possible entries from wifiD
|
| + } |
| ArrayList<NetworkInformation> result = |
| - new ArrayList<NetworkInformation>(connectivityManagerDelegate.getActiveNetworkList()); |
| + new ArrayList<NetworkInformation>(connectivityManagerList); |
| if (wifiDirectManagerDelegate != null) { |
| result.addAll(wifiDirectManagerDelegate.getActiveNetworkList()); |
| } |