From ad9dc5b6f03891852d48dc9ef3ab6bf8005a77a3 Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Sat, 11 Nov 2017 08:06:43 +0900 Subject: [PATCH] IP connectivity metrics: fix LINGER/UNLINGER logging This patch fixes a regression introduced by commit c3b3c5345ae63 for logging NetworkEvents when lingering and unlingering a network. Commit c3b3c5345ae63 removed an overloaded constructor for the NetworkEvent class, which caused NetworkEvents with event type of LINGER or UNLINGER logged in ConnectivityService to have incorrect event types (set to the network id instead) and incorrect duration (set as the event type instead). Bug: 34901696 Test: runtest frameworks-net Change-Id: Iab97a58ca805413617c8e8b4553404625a820ceb --- services/core/java/com/android/server/ConnectivityService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 664c2abdff..ce19a1c201 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -5605,7 +5605,8 @@ public class ConnectivityService extends IConnectivityManager.Stub } private void logNetworkEvent(NetworkAgentInfo nai, int evtype) { - mMetricsLog.log(new NetworkEvent(nai.network.netId, evtype)); + int[] transports = nai.networkCapabilities.getTransportTypes(); + mMetricsLog.log(nai.network.netId, transports, new NetworkEvent(evtype)); } private static boolean toBool(int encodedBoolean) {