joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Copy clat modified linkProperties into new one."

Browse source
This commit is contained in:
Treehugger Robot 2018-06-11 03:26:26 +00:00 • committed by Gerrit Code Review
commit 7d13e7cebe
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
services/core/java/com/android/server/ConnectivityService.java
View file

@ -4646,7 +4646,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);

5
services/core/java/com/android/server/connectivity/Nat464Xlat.java
View file

@ -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;
}