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

Commit f531f886 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Patch incoming LinkProperties before it's visible to the outside" into oc-mr1-dev

parents 517bb6ea 1505d705

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);

        }