LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
am: 183ec8ee35

Change-Id: Icbaa50cde14a3d00e151c1175d214cbf186fa74a
This commit is contained in:
Junyu Lai
2018-06-05 23:46:27 -07:00
committed by android-build-merger
parent 1b0ae341f8 6adee26d73
commit 893c6dc7f7
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

@@ -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 // 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. // we do anything else, make sure its LinkProperties are accurate.
if (networkAgent.clatd != null) { if (networkAgent.clatd != null) {
networkAgent.clatd.fixupLinkProperties(oldLp); networkAgent.clatd.fixupLinkProperties(oldLp, newLp);
} }
updateInterfaces(newLp, oldLp, netId, networkAgent.networkCapabilities); 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 * 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. * 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()) { if (!isRunning()) {
return; return;
} }
LinkProperties lp = mNetwork.linkProperties;
if (lp == null || lp.getAllInterfaceNames().contains(mIface)) { if (lp == null || lp.getAllInterfaceNames().contains(mIface)) {
return; return;
} }