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

Record the transport types for connectivity events.

Browse Source 
BUG: 25691077
Change-Id: I40b6de5446325e717c0356603fd66cd395db9acb
This commit is contained in:
Pierre Imai
2016-04-07 12:21:05 +09:00
parent a5ccd54500
commit 96ad7c5550
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4427,9 +4427,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
teardownUnneededNetwork(oldNetwork); teardownUnneededNetwork(oldNetwork);
} }
private void makeDefault(NetworkAgentInfo newNetwork) { private void makeDefault(NetworkAgentInfo newNetwork, NetworkAgentInfo prevNetwork) {
int prevNetId = (prevNetwork == null) ? NETID_UNSET : prevNetwork.network.netId;
if (DBG) log("Switching to new default network: " + newNetwork); if (DBG) log("Switching to new default network: " + newNetwork);
ConnectivityServiceChangeEvent.logEvent(newNetwork.network.netId);
setupDataActivityTracking(newNetwork); setupDataActivityTracking(newNetwork);
try { try {
mNetd.setDefaultNetId(newNetwork.network.netId); mNetd.setDefaultNetId(newNetwork.network.netId);
@@ -4440,6 +4440,8 @@ 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());
ConnectivityServiceChangeEvent.logEvent(newNetwork.network.netId, prevNetId,
newNetwork.networkCapabilities.getTransportTypes());
} }
// Handles a network appearing or improving its score. // Handles a network appearing or improving its score.
@@ -4590,7 +4592,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
if (isNewDefault) { if (isNewDefault) {
// Notify system services that this network is up. // Notify system services that this network is up.
makeDefault(newNetwork); makeDefault(newNetwork, oldDefaultNetwork);
synchronized (ConnectivityService.this) { synchronized (ConnectivityService.this) {
// have a new default network, release the transition wakelock in // have a new default network, release the transition wakelock in
// a second if it's held. The second pause is to allow apps // a second if it's held. The second pause is to allow apps