Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix default network transition event recording" into nyc-dev am: 9d4e66ece6

Browse Source 
am: bfbf55fcbd

* commit 'bfbf55fcbd5cbd347642023ab46b22d114f22592':
  Fix default network transition event recording

Change-Id: Ife822c39d617f89dde4cda5f2137b80425fe89ad
This commit is contained in:
Hugo Benichi
2016-05-25 03:37:19 +00:00
committed by android-build-merger
parent 332a2b1750 bfbf55fcbd
commit 06facea297
2 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/net/metrics/DefaultNetworkEvent.java
View File

@@ -68,8 +68,28 @@ public final class DefaultNetworkEvent extends IpConnectivityEvent implements Pa
@Override
public String toString() {
return String.format("DefaultNetworkEvent(%d -> %d, %s, IPv4: %b, IPv6: %b)", prevNetId,
netId, NetworkCapabilities.transportNamesOf(transportTypes), prevIPv4, prevIPv6);
String prevNetwork = String.valueOf(prevNetId);
String newNetwork = String.valueOf(netId);
if (prevNetId != 0) {
prevNetwork += ":" + ipSupport();
}
if (netId != 0) {
newNetwork += ":" + NetworkCapabilities.transportNamesOf(transportTypes);
}
return String.format("DefaultNetworkEvent(%s -> %s)", prevNetwork, newNetwork);
}
private String ipSupport() {
if (prevIPv4 && prevIPv6) {
return "DUAL";
}
if (prevIPv6) {
return "IPv6";
}
if (prevIPv4) {
return "IPv4";
}
return "NONE";
}
public static final Parcelable.Creator<DefaultNetworkEvent> CREATOR

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

@@ -2245,6 +2245,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
final boolean wasDefault = isDefaultNetwork(nai);
if (wasDefault) {
mDefaultInetConditionPublished = 0;
// Log default network disconnection before required book-keeping.
// Let rematchAllNetworksAndRequests() below record a new default network event
// if there is a fallback. Taken together, the two form a X -> 0, 0 -> Y sequence
// whose timestamps tell how long it takes to recover a default network.
logDefaultNetworkEvent(null, nai);
}
notifyIfacesChangedForNetworkStats();
// TODO - we shouldn't send CALLBACK_LOST to requests that can be satisfied
@@ -2278,10 +2283,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
mLegacyTypeTracker.remove(nai, wasDefault);
rematchAllNetworksAndRequests(null, 0);
if (wasDefault && getDefaultNetwork() == null) {
// Log that we lost the default network and there is no replacement.
logDefaultNetworkEvent(null, nai);
}
if (nai.created) {
// Tell netd to clean up the configuration for this network
// (routing rules, DNS, etc).
@@ -4584,7 +4585,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
teardownUnneededNetwork(oldNetwork);
}
private void makeDefault(NetworkAgentInfo newNetwork, NetworkAgentInfo prevNetwork) {
private void makeDefault(NetworkAgentInfo newNetwork) {
if (DBG) log("Switching to new default network: " + newNetwork);
setupDataActivityTracking(newNetwork);
try {
@@ -4596,7 +4597,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
handleApplyDefaultProxy(newNetwork.linkProperties.getHttpProxy());
updateTcpBufferSizes(newNetwork);
setDefaultDnsSystemProperties(newNetwork.linkProperties.getDnsServers());
logDefaultNetworkEvent(newNetwork, prevNetwork);
}
// Handles a network appearing or improving its score.
@@ -4747,7 +4747,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
if (isNewDefault) {
// Notify system services that this network is up.
makeDefault(newNetwork, oldDefaultNetwork);
makeDefault(newNetwork);
// Log 0 -> X and Y -> X default network transitions, where X is the new default.
logDefaultNetworkEvent(newNetwork, oldDefaultNetwork);
synchronized (ConnectivityService.this) {
// have a new default network, release the transition wakelock in
// a second if it's held. The second pause is to allow apps