Merge "Patch incoming LinkProperties before it's visible to the outside" am: 7b625191e2 am: 2f36b7afbb

am: 2cf8f74180

Change-Id: Ic82526773116db3b80449cb0241a1f80934b3d55

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

@@ -4649,7 +4649,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
             // Ignore updates for disconnected networks
             return;
         }
-
+        // newLp is already a defensive copy.
+        newLp.ensureDirectlyConnectedRoutes();
         if (VDBG) {
             log("Update of LinkProperties for " + nai.name() +
                     "; created=" + nai.created +
@@ -4659,8 +4660,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
         synchronized (nai) {
             nai.linkProperties = newLp;
         }
-        // msg.obj is already a defensive copy.
-        nai.linkProperties.ensureDirectlyConnectedRoutes();
         if (nai.everConnected) {
             updateLinkProperties(nai, oldLp);
         }