Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename get/setRetryInterval to get/setRetryIntervalsMs"

Browse Source
This commit is contained in:
Benedict Wong
2021-04-21 17:06:45 +00:00
committed by Gerrit Code Review
parent 1c09bf0d67 85d294282c
commit 9ef01fca2a
4 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/vcn/java/android/net/vcn/VcnGatewayConnectionConfigTest.java
View File

@@ -81,7 +81,7 @@ public class VcnGatewayConnectionConfigTest {
// Public for use in VcnGatewayConnectionTest
public static VcnGatewayConnectionConfig buildTestConfigWithExposedCaps(int... exposedCaps) {
final VcnGatewayConnectionConfig.Builder builder =
newBuilder().setRetryInterval(RETRY_INTERVALS_MS).setMaxMtu(MAX_MTU);
newBuilder().setRetryIntervalsMs(RETRY_INTERVALS_MS).setMaxMtu(MAX_MTU);
for (int caps : exposedCaps) {
builder.addExposedCapability(caps);
@@ -133,7 +133,7 @@ public class VcnGatewayConnectionConfigTest {
@Test
public void testBuilderRequiresNonNullRetryInterval() {
try {
newBuilder().setRetryInterval(null);
newBuilder().setRetryIntervalsMs(null);
fail("Expected exception due to invalid retryIntervalMs");
} catch (IllegalArgumentException e) {
}
@@ -142,7 +142,7 @@ public class VcnGatewayConnectionConfigTest {
@Test
public void testBuilderRequiresNonEmptyRetryInterval() {
try {
newBuilder().setRetryInterval(new long[0]);
newBuilder().setRetryIntervalsMs(new long[0]);
fail("Expected exception due to invalid retryIntervalMs");
} catch (IllegalArgumentException e) {
}

2
tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionRetryTimeoutStateTest.java
View File

@@ -38,7 +38,7 @@ public class VcnGatewayConnectionRetryTimeoutStateTest extends VcnGatewayConnect
public void setUp() throws Exception {
super.setUp();
mFirstRetryInterval = mConfig.getRetryInterval()[0];
mFirstRetryInterval = mConfig.getRetryIntervalsMs()[0];
mGatewayConnection.setUnderlyingNetwork(TEST_UNDERLYING_NETWORK_RECORD_1);
mGatewayConnection.transitionTo(mGatewayConnection.mRetryTimeoutState);