Merge "Fix NPE in NetworkMetrics" am: cb0714332d

am: 34d08160bd

Change-Id: I5c182e9cba857d291ea16fb8bd6b0a66d11cf432

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

@@ -98,6 +98,9 @@ public class NetworkMetrics {
 
     /** 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);