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

Commit 7b625191 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents c5932ab2 6c1f6fd7

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

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

        }