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 "Parcel Network#mPrivateDnsBypass" into main

Browse source
This commit is contained in:
Jean Chalard 2025-05-19 00:03:32 -07:00 • committed by Android (Google) Code Review
commit 499961d60f
1 changed files with 65 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

34
tests/common/java/android/net/NetworkTest.java
View file

@ -32,6 +32,7 @@ import com.android.testutils.ConnectivityModuleTest;
import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import com.android.testutils.ParcelUtils;
import org.junit.Rule;
import org.junit.Test;
@ -200,4 +201,37 @@ public class NetworkTest {
assertNotEquals(copy.netId, copy.getNetIdForResolv());
assertNotEquals(mNetwork.getNetIdForResolv(), copy.getNetIdForResolv());
}
// Connectivity module was not supported until S
@Test @IgnoreUpTo(Build.VERSION_CODES.R)
@ConnectivityModuleTest
public void testGetNonPrivateDnsBypassingCopy() {
final Network bypass = mNetwork.getPrivateDnsBypassingCopy();
final Network nonBypass = bypass.getPrivateDnsNonBypassingCopy();
assertEquals(mNetwork.netId, nonBypass.netId);
assertEquals(nonBypass.netId, nonBypass.getNetIdForResolv());
assertEquals(mNetwork.getNetIdForResolv(), nonBypass.getNetIdForResolv());
assertNotEquals(mNetwork.getNetIdForResolv(), bypass.getNetIdForResolv());
}
// Only run this test on V and below
@Test @IgnoreAfter(Build.VERSION_CODES.VANILLA_ICE_CREAM)
@ConnectivityModuleTest
public void testParcelingRoundTripBeforeB() {
// Before B, the netID for resolv is not parceled.
final Network bypass =
ParcelUtils.parcelingRoundTrip(mNetwork.getPrivateDnsBypassingCopy());
assertEquals(mNetwork.netId, bypass.netId);
assertEquals(mNetwork.getNetIdForResolv(), bypass.getNetIdForResolv());
}
// Only run this test on B and after
@Test @IgnoreUpTo(Build.VERSION_CODES.VANILLA_ICE_CREAM)
@ConnectivityModuleTest
public void testParcelingRoundTripFromB() {
final Network bypass =
ParcelUtils.parcelingRoundTrip(mNetwork.getPrivateDnsBypassingCopy());
assertEquals(mNetwork.netId, bypass.netId);
assertNotEquals(mNetwork.getNetIdForResolv(), bypass.getNetIdForResolv());
}
}