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

Filter out the network in networkmonitor if the linkProperties is null.

Browse Source 
It may be null if the network is unknown.
Also revised the logging to replace network id with network.toString(). They are pretty much the same for logging but network.toString does not need to parse the int value.

BUG=

Review URL: https://codereview.webrtc.org/1774343002

Cr-Commit-Position: refs/heads/master@{#11925}
This commit is contained in:
honghaiz
2016-03-08 20:50:00 -08:00
committed by Commit bot
parent 07e3d89c5b
commit 97aacee11d
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
webrtc/api/java/android/org/webrtc/NetworkMonitorAutoDetect.java
View File

@ -143,15 +143,14 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver {
public void onLosing(Network network, int maxMsToLive) {
// Tell the network is going to lose in MaxMsToLive milliseconds.
// We may use this signal later.
Logging.d(TAG, "Network with handle " + networkToNetId(network) +
" is about to lose in " + maxMsToLive + "ms");
Logging.d(TAG,
"Network " + network.toString() + " is about to lose in " + maxMsToLive + "ms");
}
@Override
public void onLost(Network network) {
int handle = networkToNetId(network);
Logging.d(TAG, "Network with handle " + handle + " is disconnected");
observer.onNetworkDisconnect(handle);
Logging.d(TAG, "Network " + network.toString() + " is disconnected");
observer.onNetworkDisconnect(networkToNetId(network));
}
private void onNetworkChanged(Network network) {
@ -283,9 +282,13 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver {
@SuppressLint("NewApi")
private NetworkInformation networkToInfo(Network network) {
LinkProperties linkProperties = connectivityManager.getLinkProperties(network);
int networkId = networkToNetId(network);
// getLinkProperties will return null if the network is unknown.
if (linkProperties == null) {
Logging.w(TAG, "Detected unknown network: " + network.toString());
return null;
}
if (linkProperties.getInterfaceName() == null) {
Logging.w(TAG, "Null interface name for network id " + networkId);
Logging.w(TAG, "Null interface name for network " + network.toString());
return null;
}
@ -296,14 +299,14 @@ public class NetworkMonitorAutoDetect extends BroadcastReceiver {
// NONE when the network disconnects. But in some devices, the OS may incorrectly
// report an UNKNOWN connection type. In either case, it won't benefit to send down
// a network event with this connection type.
Logging.d(TAG, "Network with id " + networkId + " has connection type " + connectionType);
Logging.d(TAG, "Network " + network.toString() + " has connection type " + connectionType);
return null;
}
NetworkInformation networkInformation = new NetworkInformation(
linkProperties.getInterfaceName(),
connectionType,
networkId,
networkToNetId(network),
getIPAddresses(linkProperties));
return networkInformation;
}