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

am: 2a4b62dd12

Change-Id: I69700df358f8c5481d03b051163ba020e83c9fe4

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

@@ -4641,7 +4641,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 +
@@ -4651,8 +4652,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);
         }