zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix null ref in NetworkMonitorAutoDetect if Connectivity Manager service is unavailable

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

Review-Url: https://codereview.webrtc.org/2963363002
Cr-Commit-Position: refs/heads/master@{#18906}
This commit is contained in:
bdodson
2017-07-05 09:55:09 -07:00
committed by Commit Bot
parent e4f63a1929
commit 6aa95117d8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
View File

@ -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());
}