From 96ad7c55504bae73a0cb740fa523330a8f8b6a0a Mon Sep 17 00:00:00 2001 From: Pierre Imai Date: Thu, 7 Apr 2016 12:21:05 +0900 Subject: [PATCH] Record the transport types for connectivity events. BUG: 25691077 Change-Id: I40b6de5446325e717c0356603fd66cd395db9acb --- .../core/java/com/android/server/ConnectivityService.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 2ccc3fe80e..0a8b65d467 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -4427,9 +4427,9 @@ public class ConnectivityService extends IConnectivityManager.Stub 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); - ConnectivityServiceChangeEvent.logEvent(newNetwork.network.netId); setupDataActivityTracking(newNetwork); try { mNetd.setDefaultNetId(newNetwork.network.netId); @@ -4440,6 +4440,8 @@ public class ConnectivityService extends IConnectivityManager.Stub handleApplyDefaultProxy(newNetwork.linkProperties.getHttpProxy()); updateTcpBufferSizes(newNetwork); setDefaultDnsSystemProperties(newNetwork.linkProperties.getDnsServers()); + ConnectivityServiceChangeEvent.logEvent(newNetwork.network.netId, prevNetId, + newNetwork.networkCapabilities.getTransportTypes()); } // Handles a network appearing or improving its score. @@ -4590,7 +4592,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } if (isNewDefault) { // Notify system services that this network is up. - makeDefault(newNetwork); + makeDefault(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