LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: eb8372d38c

Browse Source 
am: 1e7c9fb57e

* commit '1e7c9fb57e25d22c2d5a48a590728f6bb7875360':
  Some fixes in ConnectivityService event logging

Change-Id: Icb50bdab260da6476c1d1148fa2d8995b106a809
This commit is contained in:
Hugo Benichi
2016-04-21 04:19:53 +00:00
committed by android-build-merger
parent b52edda26a 1e7c9fb57e
commit d937aed3da
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -71,7 +71,7 @@ import android.net.ProxyInfo;
import android.net.RouteInfo; import android.net.RouteInfo;
import android.net.UidRange; import android.net.UidRange;
import android.net.Uri; import android.net.Uri;
import android.net.metrics.ConnectivityServiceChangeEvent; import android.net.metrics.DefaultNetworkEvent;
import android.os.Binder; import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@@ -2220,7 +2220,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
rematchAllNetworksAndRequests(null, 0); rematchAllNetworksAndRequests(null, 0);
if (wasDefault && getDefaultNetwork() == null) { if (wasDefault && getDefaultNetwork() == null) {
// Log that we lost the default network and there is no replacement. // Log that we lost the default network and there is no replacement.
logConnectivityServiceChangeEvent(null, nai); logDefaultNetworkEvent(null, nai);
} }
if (nai.created) { if (nai.created) {
// Tell netd to clean up the configuration for this network // Tell netd to clean up the configuration for this network
@@ -4455,8 +4455,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
handleApplyDefaultProxy(newNetwork.linkProperties.getHttpProxy()); handleApplyDefaultProxy(newNetwork.linkProperties.getHttpProxy());
updateTcpBufferSizes(newNetwork); updateTcpBufferSizes(newNetwork);
setDefaultDnsSystemProperties(newNetwork.linkProperties.getDnsServers()); setDefaultDnsSystemProperties(newNetwork.linkProperties.getDnsServers());
logDefaultNetworkEvent(newNetwork, prevNetwork);
logConnectivityServiceChangeEvent(newNetwork, prevNetwork);
} }
// Handles a network appearing or improving its score. // Handles a network appearing or improving its score.
@@ -5078,21 +5077,24 @@ public class ConnectivityService extends IConnectivityManager.Stub
return new NetworkMonitor(context, handler, nai, defaultRequest); return new NetworkMonitor(context, handler, nai, defaultRequest);
} }
private static void logConnectivityServiceChangeEvent( private static void logDefaultNetworkEvent(NetworkAgentInfo newNai, NetworkAgentInfo prevNai) {
NetworkAgentInfo next, NetworkAgentInfo prev) { int newNetid = NETID_UNSET;
final int newNetId = (next == null) ? NETID_UNSET : next.network.netId; int prevNetid = NETID_UNSET;
final int[] newTransportTypes = (next == null) int[] transports = new int[0];
? new int[0] boolean hadIPv4 = false;
: next.networkCapabilities.getTransportTypes(); boolean hadIPv6 = false;
final int oldNetId = (prev == null) ? NETID_UNSET : prev.network.netId; if (newNai != null) {
final boolean hadIPv4 = (prev != null) && newNetid = newNai.network.netId;
prev.linkProperties.hasIPv4Address() && transports = newNai.networkCapabilities.getTransportTypes();
prev.linkProperties.hasIPv4DefaultRoute(); }
final boolean hadIPv6 = (prev != null) && if (prevNai != null) {
prev.linkProperties.hasGlobalIPv6Address() && prevNetid = prevNai.network.netId;
prev.linkProperties.hasIPv6DefaultRoute(); final LinkProperties lp = prevNai.linkProperties;
ConnectivityServiceChangeEvent.logEvent(newNetId, newTransportTypes, hadIPv4 = lp.hasIPv4Address() && lp.hasIPv4DefaultRoute();
oldNetId, hadIPv4, hadIPv6); hadIPv6 = lp.hasGlobalIPv6Address() && lp.hasIPv6DefaultRoute();
}
DefaultNetworkEvent.logEvent(newNetid, transports, prevNetid, hadIPv4, hadIPv6);
} }
} }