commit ca13c0553a7ea5d3b81c499908fe770766ef3911
author Hugo Benichi <hugobenichi@google.com> Sat Feb 24 19:21:43 2018 +0000
committer android-build-merger <android-build-merger@google.com> Sat Feb 24 19:21:43 2018 +0000
tree 5ca99a360af4c58e2e5ea43b71bdd6066bd60672
parent ef2ac4066b1bc7c893848358d9351aa7f54fe2c6
parent 34d08160bd12cd2e53bc964531cb38e92692565e

Merge "Fix NPE in NetworkMetrics" am: cb0714332d
am: 34d08160bd

Change-Id: I5c182e9cba857d291ea16fb8bd6b0a66d11cf432

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

diff --git a/core/java/android/net/metrics/NetworkMetrics.java b/core/java/android/net/metrics/NetworkMetrics.java
index 2425bba..66d92c4 100644
--- a/core/java/android/net/metrics/NetworkMetrics.java
+++ b/core/java/android/net/metrics/NetworkMetrics.java
@@ -98,6 +98,9 @@
 
     /** Accumulate a single netd sock_diag poll result reported by netd. */
     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.roundTripTimeUs.count(rttUs);
         pendingSummary.sentAckTimeDiffenceMs.count(sentAckDiffMs);