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

Merge "Also support 464xlat on SUSPENDED networks" am: 995a28d334 am: 698b2ee406

Browse Source 
am: 1347ac8109

Change-Id: I83ae39a2e36bc036dce419c80dd476d2358b4537
This commit is contained in:
Erik Kline
2017-09-21 12:06:05 +00:00
committed by android-build-merger
parent 8f1245607a 698b2ee406
commit 0bbe489393
3 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,6 +84,32 @@ public class Nat464XlatTest {
when(mConfig.getLinkAddress()).thenReturn(ADDR);
}
@Test
public void testRequiresClat() throws Exception {
final int[] supportedTypes = {
ConnectivityManager.TYPE_MOBILE,
ConnectivityManager.TYPE_WIFI,
ConnectivityManager.TYPE_ETHERNET,
};
// NetworkInfo doesn't allow setting the State directly, but rather
// requires setting DetailedState in order set State as a side-effect.
final NetworkInfo.DetailedState[] supportedDetailedStates = {
NetworkInfo.DetailedState.CONNECTED,
NetworkInfo.DetailedState.SUSPENDED,
};
for (int type : supportedTypes) {
mNai.networkInfo.setType(type);
for (NetworkInfo.DetailedState state : supportedDetailedStates) {
mNai.networkInfo.setDetailedState(state, "reason", "extraInfo");
assertTrue(
String.format("requiresClat expected for type=%d state=%s", type, state),
Nat464Xlat.requiresClat(mNai));
}
}
}
@Test
public void testNormalStartAndStop() throws Exception {
Nat464Xlat nat = makeNat464Xlat();