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

Merge "Delete the legacy framework code for manipulating ND offload." am: 3c0bf71eee am: fc56002707

Browse Source 
am: bb21618a86

Change-Id: I07d9753e214af311d3dcab6f8016442f60388700
This commit is contained in:
Lorenzo Colitti
2017-09-27 11:05:29 +00:00
committed by android-build-merger
parent 765027efbe fc56002707
commit f384a58f79
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/connectivity/Nat464Xlat.java
View File

@@ -152,7 +152,6 @@ public class Nat464Xlat extends BaseNetworkObserver {
* turn ND offload off if on WiFi. * turn ND offload off if on WiFi.
*/ */
private void enterRunningState() { private void enterRunningState() {
maybeSetIpv6NdOffload(mBaseIface, false);
mState = State.RUNNING; mState = State.RUNNING;
} }
@@ -160,10 +159,6 @@ public class Nat464Xlat extends BaseNetworkObserver {
* Stop clatd, and turn ND offload on if it had been turned off. * Stop clatd, and turn ND offload on if it had been turned off.
*/ */
private void enterStoppingState() { private void enterStoppingState() {
if (isRunning()) {
maybeSetIpv6NdOffload(mBaseIface, true);
}
try { try {
mNMService.stopClatd(mBaseIface); mNMService.stopClatd(mBaseIface);
} catch(RemoteException|IllegalStateException e) { } catch(RemoteException|IllegalStateException e) {
@@ -279,19 +274,6 @@ public class Nat464Xlat extends BaseNetworkObserver {
} }
} }
private void maybeSetIpv6NdOffload(String iface, boolean on) {
// TODO: migrate to NetworkCapabilities.TRANSPORT_*.
if (mNetwork.networkInfo.getType() != ConnectivityManager.TYPE_WIFI) {
return;
}
try {
Slog.d(TAG, (on ? "En" : "Dis") + "abling ND offload on " + iface);
mNMService.setInterfaceIpv6NdOffload(iface, on);
} catch(RemoteException|IllegalStateException e) {
Slog.w(TAG, "Changing IPv6 ND offload on " + iface + "failed: " + e);
}
}
/** /**
* Adds stacked link on base link and transitions to RUNNING state. * Adds stacked link on base link and transitions to RUNNING state.
*/ */

4
tests/net/java/com/android/server/connectivity/Nat464XlatTest.java
View File

@@ -126,7 +126,6 @@ public class Nat464XlatTest {
mLooper.dispatchNext(); mLooper.dispatchNext();
verify(mNms).getInterfaceConfig(eq(STACKED_IFACE)); verify(mNms).getInterfaceConfig(eq(STACKED_IFACE));
verify(mNms).setInterfaceIpv6NdOffload(eq(BASE_IFACE), eq(false));
verify(mConnectivity).handleUpdateLinkProperties(eq(mNai), c.capture()); verify(mConnectivity).handleUpdateLinkProperties(eq(mNai), c.capture());
assertFalse(c.getValue().getStackedLinks().isEmpty()); assertFalse(c.getValue().getStackedLinks().isEmpty());
assertTrue(c.getValue().getAllInterfaceNames().contains(STACKED_IFACE)); assertTrue(c.getValue().getAllInterfaceNames().contains(STACKED_IFACE));
@@ -136,7 +135,6 @@ public class Nat464XlatTest {
nat.stop(); nat.stop();
verify(mNms).stopClatd(eq(BASE_IFACE)); verify(mNms).stopClatd(eq(BASE_IFACE));
verify(mNms).setInterfaceIpv6NdOffload(eq(BASE_IFACE), eq(true));
// Stacked interface removed notification arrives. // Stacked interface removed notification arrives.
nat.interfaceRemoved(STACKED_IFACE); nat.interfaceRemoved(STACKED_IFACE);
@@ -167,7 +165,6 @@ public class Nat464XlatTest {
mLooper.dispatchNext(); mLooper.dispatchNext();
verify(mNms).getInterfaceConfig(eq(STACKED_IFACE)); verify(mNms).getInterfaceConfig(eq(STACKED_IFACE));
verify(mNms).setInterfaceIpv6NdOffload(eq(BASE_IFACE), eq(false));
verify(mConnectivity, times(1)).handleUpdateLinkProperties(eq(mNai), c.capture()); verify(mConnectivity, times(1)).handleUpdateLinkProperties(eq(mNai), c.capture());
assertFalse(c.getValue().getStackedLinks().isEmpty()); assertFalse(c.getValue().getStackedLinks().isEmpty());
assertTrue(c.getValue().getAllInterfaceNames().contains(STACKED_IFACE)); assertTrue(c.getValue().getAllInterfaceNames().contains(STACKED_IFACE));
@@ -179,7 +176,6 @@ public class Nat464XlatTest {
verify(mNms).unregisterObserver(eq(nat)); verify(mNms).unregisterObserver(eq(nat));
verify(mNms).stopClatd(eq(BASE_IFACE)); verify(mNms).stopClatd(eq(BASE_IFACE));
verify(mNms).setInterfaceIpv6NdOffload(eq(BASE_IFACE), eq(true));
verify(mConnectivity, times(2)).handleUpdateLinkProperties(eq(mNai), c.capture()); verify(mConnectivity, times(2)).handleUpdateLinkProperties(eq(mNai), c.capture());
assertTrue(c.getValue().getStackedLinks().isEmpty()); assertTrue(c.getValue().getStackedLinks().isEmpty());
assertFalse(c.getValue().getAllInterfaceNames().contains(STACKED_IFACE)); assertFalse(c.getValue().getAllInterfaceNames().contains(STACKED_IFACE));