| Index: talk/app/webrtc/java/android/org/webrtc/NetworkMonitor.java
|
| diff --git a/talk/app/webrtc/java/android/org/webrtc/NetworkMonitor.java b/talk/app/webrtc/java/android/org/webrtc/NetworkMonitor.java
|
| index c40dd159d9fb1d5433ed54ec8dcc6f54371807af..a075b3689447cfeeaf978a0e6fca3e902f0aff8a 100644
|
| --- a/talk/app/webrtc/java/android/org/webrtc/NetworkMonitor.java
|
| +++ b/talk/app/webrtc/java/android/org/webrtc/NetworkMonitor.java
|
| @@ -36,6 +36,7 @@ import org.webrtc.Logging;
|
| import android.content.Context;
|
|
|
| import java.util.ArrayList;
|
| +import java.util.List;
|
|
|
| /**
|
| * Borrowed from Chromium's src/net/android/java/src/org/chromium/net/NetworkChangeNotifier.java
|
| @@ -208,10 +209,13 @@ public class NetworkMonitor {
|
| }
|
|
|
| private void updateActiveNetworkList() {
|
| - NetworkInformation[] networkInfos = autoDetector.getActiveNetworkList();
|
| - if (networkInfos.length == 0) {
|
| + List<NetworkInformation> networkInfoList = autoDetector.getActiveNetworkList();
|
| + if (networkInfoList == null || networkInfoList.size() == 0) {
|
| return;
|
| }
|
| +
|
| + NetworkInformation[] networkInfos = new NetworkInformation[networkInfoList.size()];
|
| + networkInfos = networkInfoList.toArray(networkInfos);
|
| for (long nativeObserver : nativeNetworkObservers) {
|
| nativeNotifyOfActiveNetworkList(nativeObserver, networkInfos);
|
| }
|
|
|