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

Commit dcf008a0 authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge "Fix NPE in NetworkMetrics" am: cb071433 am: 34d08160 

am: ca13c055

Change-Id: I66e07968b013c941706d4c772684fa8851e0ccf3
parents fde44563 ca13c055

core/java/android/net/metrics/NetworkMetrics.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -98,6 +98,9 @@ public class NetworkMetrics { 




    /** Accumulate a single netd sock_diag poll result reported by netd. */

    /** Accumulate a single netd sock_diag poll result reported by netd. */

    public void addTcpStatsResult(int sent, int lost, int rttUs, int sentAckDiffMs) {

    public void addTcpStatsResult(int sent, int lost, int rttUs, int sentAckDiffMs) {

        if (pendingSummary == null) {

            pendingSummary = new Summary(netId, transports);

        }

        pendingSummary.tcpLossRate.count(lost, sent);

        pendingSummary.tcpLossRate.count(lost, sent);

        pendingSummary.roundTripTimeUs.count(rttUs);

        pendingSummary.roundTripTimeUs.count(rttUs);

        pendingSummary.sentAckTimeDiffenceMs.count(sentAckDiffMs);

        pendingSummary.sentAckTimeDiffenceMs.count(sentAckDiffMs);