Merge "Pass result list in return value, not in param" (89b87072) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/DefaultNetworkMetrics.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -82,12 +82,14 @@ public class DefaultNetworkMetrics {
		}

		/**
		* Convert events in the ring buffer to protos and add to the given list
		* Convert events in the ring buffer to a list of IpConnectivityEvent protos
		*/
		public synchronized void listEventsAsProto(List<IpConnectivityEvent> out) {
		public synchronized List<IpConnectivityEvent> listEventsAsProto() {
		List<IpConnectivityEvent> list = new ArrayList<>();
		for (DefaultNetworkEvent ev : mEventsLog.toArray()) {
		out.add(IpConnectivityEventBuilder.toProto(ev));
		list.add(IpConnectivityEventBuilder.toProto(ev));
		}
		return list;
		}

		public synchronized void flushEvents(List<IpConnectivityEvent> out) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -244,9 +244,9 @@ final public class IpConnectivityMetrics extends SystemService {
		private List<IpConnectivityEvent> listEventsAsProtos() {
		final List<IpConnectivityEvent> events = IpConnectivityEventBuilder.toProto(getEvents());
		if (mNetdListener != null) {
		mNetdListener.listAsProtos(events);
		events.addAll(mNetdListener.listAsProtos());
		}
		mDefaultNetworkMetrics.listEventsAsProto(events);
		events.addAll(mDefaultNetworkMetrics.listEventsAsProto());
		return events;
		}

+7 −5

Original line number	Diff line number	Diff line
		@@ -367,18 +367,20 @@ public class NetdEventListenerService extends INetdEventListener.Stub {
		}

		/**
		* Convert events in the buffer to protos and add to the given list
		* Convert events in the buffer to a list of IpConnectivityEvent protos
		*/
		public synchronized void listAsProtos(List<IpConnectivityEvent> out) {
		public synchronized List<IpConnectivityEvent> listAsProtos() {
		List<IpConnectivityEvent> list = new ArrayList<>();
		for (int i = 0; i < mNetworkMetrics.size(); i++) {
		out.add(IpConnectivityEventBuilder.toProto(mNetworkMetrics.valueAt(i).connectMetrics));
		list.add(IpConnectivityEventBuilder.toProto(mNetworkMetrics.valueAt(i).connectMetrics));
		}
		for (int i = 0; i < mNetworkMetrics.size(); i++) {
		out.add(IpConnectivityEventBuilder.toProto(mNetworkMetrics.valueAt(i).dnsMetrics));
		list.add(IpConnectivityEventBuilder.toProto(mNetworkMetrics.valueAt(i).dnsMetrics));
		}
		for (int i = 0; i < mWakeupStats.size(); i++) {
		out.add(IpConnectivityEventBuilder.toProto(mWakeupStats.valueAt(i)));
		list.add(IpConnectivityEventBuilder.toProto(mWakeupStats.valueAt(i)));
		}
		return list;
		}

		private long getTransports(int netId) {