Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pass result list in return value, not in param"

Browse Source
This commit is contained in:
Mike Ma
2020-01-23 07:20:41 +00:00
committed by Android (Google) Code Review
parent acf452054e e19df93aad
commit 89b8707267
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/connectivity/DefaultNetworkMetrics.java
View File

@@ -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) {

4
services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java
View File

@@ -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;
}

12
services/core/java/com/android/server/connectivity/NetdEventListenerService.java
View File

@@ -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) {