Commit edf5c248 authored Nov 11, 2017 by Hugo Benichi

IP connectivity metrics: fix LINGER/UNLINGER logging

This patch fixes a regression introduced by commit 97bfd276
for logging NetworkEvents when lingering and unlingering a network.

Commit 97bfd276 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

parent f7f5732e

services/core/java/com/android/server/ConnectivityService.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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) {