Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e19df93a authored by Mike Ma's avatar Mike Ma
Browse files

Pass result list in return value, not in param 

Address comment in ag/10101436. Passing the result list in
listEventsAsProto() through return value not through adding to existing
param.

Bug: 146086778
Test: $ incident_report 3049, then compare the content with "dumpsys
      connmetrics"

Change-Id: Icf0c11650883172d6ffeecdf7f898b3c6fb85b27
parent 6bf8baea

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

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

+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;

    }

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

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