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

Commit 49620a7f authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Update the transport types of metrics" am: 70be96ff 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884199

Change-Id: I041ead53badcad1480b7c5cd42f5fbd188440bbc
parents 44ee49d6 70be96ff

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

+10 −15
Original line number Diff line number Diff line
@@ -171,25 +171,28 @@ public class NetdEventListenerService extends INetdEventListener.Stub { 
    }



    private NetworkMetrics getMetricsForNetwork(long timeMs, int netId) {

        collectPendingMetricsSnapshot(timeMs);

        NetworkMetrics metrics = mNetworkMetrics.get(netId);

        if (metrics == null) {

            // TODO: allow to change transport for a given netid.

            metrics = new NetworkMetrics(netId, getTransports(netId), mConnectTb);

        final NetworkCapabilities nc = mCallback.getNetworkCapabilities(netId);

        final long transports = (nc != null) ? BitUtils.packBits(nc.getTransportTypes()) : 0;

        final boolean forceCollect =

                (metrics != null && nc != null && metrics.transports != transports);

        collectPendingMetricsSnapshot(timeMs, forceCollect);

        if (metrics == null || forceCollect) {

            metrics = new NetworkMetrics(netId, transports, mConnectTb);

            mNetworkMetrics.put(netId, metrics);

        }

        return metrics;

    }



    private NetworkMetricsSnapshot[] getNetworkMetricsSnapshots() {

        collectPendingMetricsSnapshot(System.currentTimeMillis());

        collectPendingMetricsSnapshot(System.currentTimeMillis(), false /* forceCollect */);

        return mNetworkMetricsSnapshots.toArray();

    }



    private void collectPendingMetricsSnapshot(long timeMs) {

    private void collectPendingMetricsSnapshot(long timeMs, boolean forceCollect) {

        // Detects time differences larger than the snapshot collection period.

        // This is robust against clock jumps and long inactivity periods.

        if (Math.abs(timeMs - mLastSnapshot) <= METRICS_SNAPSHOT_SPAN_MS) {

        if (!forceCollect && Math.abs(timeMs - mLastSnapshot) <= METRICS_SNAPSHOT_SPAN_MS) {

            return;

        }

        mLastSnapshot = projectSnapshotTime(timeMs);
@@ -394,14 +397,6 @@ public class NetdEventListenerService extends INetdEventListener.Stub { 
        return list;

    }



    private long getTransports(int netId) {

        final NetworkCapabilities nc = mCallback.getNetworkCapabilities(netId);

        if (nc == null) {

            return 0;

        }

        return BitUtils.packBits(nc.getTransportTypes());

    }



    /** Helper class for buffering summaries of NetworkMetrics at regular time intervals */

    static class NetworkMetricsSnapshot {