commit a1b71308b593086fdc084fd5e49f33fb429d55db
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 06 05:39:39 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 06 05:39:39 2018 +0000
tree 62440684dc52cdcc1d21a9154524c8942a3f40fc
parent 54ddecb0f80006a5865be21dcd51b75e6bd9a22c
parent 39744fd0c74e8619373063275a381930b7e3ac78

Merge "Connectivity: Fix map access"

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 3021e6a..6c24e94 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -5439,8 +5439,11 @@
         if (!networkAgent.everConnected && state == NetworkInfo.State.CONNECTED) {
             networkAgent.everConnected = true;
 
+            if (networkAgent.linkProperties == null) {
+                Slog.wtf(TAG, networkAgent.name() + " connected with null LinkProperties");
+            }
+
             updateLinkProperties(networkAgent, null);
-            notifyIfacesChangedForNetworkStats();
 
             networkAgent.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED);
             scheduleUnvalidatedPrompt(networkAgent);