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

Commit 38f8d38f authored by Junyu Lai's avatar Junyu Lai Committed by android-build-merger
Browse files

Merge "Copy clat modified linkProperties into new one." into pi-dev 

am: 183ec8ee

Change-Id: I61076b5344157f0ec04086c8911fd0b1187f9a76
parents 19030101 183ec8ee

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

+1 −1
Original line number Diff line number Diff line
@@ -4690,7 +4690,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        // The NetworkAgentInfo does not know whether clatd is running on its network or not. Before

        // we do anything else, make sure its LinkProperties are accurate.

        if (networkAgent.clatd != null) {

            networkAgent.clatd.fixupLinkProperties(oldLp);

            networkAgent.clatd.fixupLinkProperties(oldLp, newLp);

        }



        updateInterfaces(newLp, oldLp, netId, networkAgent.networkCapabilities);

services/core/java/com/android/server/connectivity/Nat464Xlat.java

+2 −3
Original line number Diff line number Diff line
@@ -224,15 +224,14 @@ public class Nat464Xlat extends BaseNetworkObserver { 
    }



    /**

     * Copies the stacked clat link in oldLp, if any, to the LinkProperties in mNetwork.

     * Copies the stacked clat link in oldLp, if any, to the passed LinkProperties.

     * This is necessary because the LinkProperties in mNetwork come from the transport layer, which

     * has no idea that 464xlat is running on top of it.

     */

    public void fixupLinkProperties(LinkProperties oldLp) {

    public void fixupLinkProperties(LinkProperties oldLp, LinkProperties lp) {

        if (!isRunning()) {

            return;

        }

        LinkProperties lp = mNetwork.linkProperties;

        if (lp == null || lp.getAllInterfaceNames().contains(mIface)) {

            return;

        }