Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1fb92df authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

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

Merge "Patch incoming LinkProperties before it's visible to the outside" am: 7b625191 am: 2a4b62dd
am: 2cf8f741

Change-Id: Ic82526773116db3b80449cb0241a1f80934b3d55
parents b7fb3656 2cf8f741

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

+2 −3
Original line number Diff line number Diff line
@@ -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);

        }