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

Merge "Update set|getRetryIntervalsMs to Millis"

Browse Source
This commit is contained in:
Benedict Wong
2021-04-29 04:35:45 +00:00
committed by Gerrit Code Review
parent 67bea71a2f e7f06d9eb9
commit c6fe30068d
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -25710,7 +25710,7 @@ package android.net.vcn {
method @NonNull public int[] getExposedCapabilities(); method @NonNull public int[] getExposedCapabilities();
method @NonNull public String getGatewayConnectionName(); method @NonNull public String getGatewayConnectionName();
method @IntRange(from=android.net.vcn.VcnGatewayConnectionConfig.MIN_MTU_V6) public int getMaxMtu(); method @IntRange(from=android.net.vcn.VcnGatewayConnectionConfig.MIN_MTU_V6) public int getMaxMtu();
method @NonNull public long[] getRetryIntervalsMs(); method @NonNull public long[] getRetryIntervalsMillis();
} }
public static final class VcnGatewayConnectionConfig.Builder { public static final class VcnGatewayConnectionConfig.Builder {
@@ -25719,7 +25719,7 @@ package android.net.vcn {
method @NonNull public android.net.vcn.VcnGatewayConnectionConfig build(); method @NonNull public android.net.vcn.VcnGatewayConnectionConfig build();
method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder removeExposedCapability(int); method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder removeExposedCapability(int);
method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setMaxMtu(@IntRange(from=android.net.vcn.VcnGatewayConnectionConfig.MIN_MTU_V6) int); method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setMaxMtu(@IntRange(from=android.net.vcn.VcnGatewayConnectionConfig.MIN_MTU_V6) int);
method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setRetryIntervalsMs(@NonNull long[]); method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setRetryIntervalsMillis(@NonNull long[]);
} }
public class VcnManager { public class VcnManager {

8
core/java/android/net/vcn/VcnGatewayConnectionConfig.java
View File

@@ -136,7 +136,7 @@ public final class VcnGatewayConnectionConfig {
* <p>To ensure the device is not constantly being woken up, this retry interval MUST be greater * <p>To ensure the device is not constantly being woken up, this retry interval MUST be greater
* than this value. * than this value.
* *
* @see {@link Builder#setRetryIntervalsMs()} * @see {@link Builder#setRetryIntervalsMillis()}
*/ */
private static final long MINIMUM_REPEATING_RETRY_INTERVAL_MS = TimeUnit.MINUTES.toMillis(15); private static final long MINIMUM_REPEATING_RETRY_INTERVAL_MS = TimeUnit.MINUTES.toMillis(15);
@@ -337,10 +337,10 @@ public final class VcnGatewayConnectionConfig {
/** /**
* Retrieves the configured retry intervals. * Retrieves the configured retry intervals.
* *
* @see Builder#setRetryIntervalsMs(long[]) * @see Builder#setRetryIntervalsMillis(long[])
*/ */
@NonNull @NonNull
public long[] getRetryIntervalsMs() { public long[] getRetryIntervalsMillis() {
return Arrays.copyOf(mRetryIntervalsMs, mRetryIntervalsMs.length); return Arrays.copyOf(mRetryIntervalsMs, mRetryIntervalsMs.length);
} }
@@ -550,7 +550,7 @@ public final class VcnGatewayConnectionConfig {
* @see VcnManager for additional discussion on fail-safe mode * @see VcnManager for additional discussion on fail-safe mode
*/ */
@NonNull @NonNull
public Builder setRetryIntervalsMs(@NonNull long[] retryIntervalsMs) { public Builder setRetryIntervalsMillis(@NonNull long[] retryIntervalsMs) {
validateRetryInterval(retryIntervalsMs); validateRetryInterval(retryIntervalsMs);
mRetryIntervalsMs = retryIntervalsMs; mRetryIntervalsMs = retryIntervalsMs;

2
services/core/java/com/android/server/vcn/VcnGatewayConnection.java
View File

@@ -1851,7 +1851,7 @@ public class VcnGatewayConnection extends StateMachine {
private long getNextRetryIntervalsMs() { private long getNextRetryIntervalsMs() {
final int retryDelayIndex = mFailedAttempts - 1; final int retryDelayIndex = mFailedAttempts - 1;
final long[] retryIntervalsMs = mConnectionConfig.getRetryIntervalsMs(); final long[] retryIntervalsMs = mConnectionConfig.getRetryIntervalsMillis();
// Repeatedly use last item in retry timeout list. // Repeatedly use last item in retry timeout list.
if (retryDelayIndex >= retryIntervalsMs.length) { if (retryDelayIndex >= retryIntervalsMs.length) {

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

@@ -82,7 +82,7 @@ public class VcnGatewayConnectionConfigTest {
// Public for use in VcnGatewayConnectionTest // Public for use in VcnGatewayConnectionTest
public static VcnGatewayConnectionConfig buildTestConfigWithExposedCaps(int... exposedCaps) { public static VcnGatewayConnectionConfig buildTestConfigWithExposedCaps(int... exposedCaps) {
final VcnGatewayConnectionConfig.Builder builder = final VcnGatewayConnectionConfig.Builder builder =
newBuilder().setRetryIntervalsMs(RETRY_INTERVALS_MS).setMaxMtu(MAX_MTU); newBuilder().setRetryIntervalsMillis(RETRY_INTERVALS_MS).setMaxMtu(MAX_MTU);
for (int caps : exposedCaps) { for (int caps : exposedCaps) {
builder.addExposedCapability(caps); builder.addExposedCapability(caps);
@@ -134,7 +134,7 @@ public class VcnGatewayConnectionConfigTest {
@Test @Test
public void testBuilderRequiresNonNullRetryInterval() { public void testBuilderRequiresNonNullRetryInterval() {
try { try {
newBuilder().setRetryIntervalsMs(null); newBuilder().setRetryIntervalsMillis(null);
fail("Expected exception due to invalid retryIntervalMs"); fail("Expected exception due to invalid retryIntervalMs");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
} }
@@ -143,7 +143,7 @@ public class VcnGatewayConnectionConfigTest {
@Test @Test
public void testBuilderRequiresNonEmptyRetryInterval() { public void testBuilderRequiresNonEmptyRetryInterval() {
try { try {
newBuilder().setRetryIntervalsMs(new long[0]); newBuilder().setRetryIntervalsMillis(new long[0]);
fail("Expected exception due to invalid retryIntervalMs"); fail("Expected exception due to invalid retryIntervalMs");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
} }
@@ -174,7 +174,7 @@ public class VcnGatewayConnectionConfigTest {
assertEquals(TUNNEL_CONNECTION_PARAMS, config.getTunnelConnectionParams()); assertEquals(TUNNEL_CONNECTION_PARAMS, config.getTunnelConnectionParams());
assertArrayEquals(RETRY_INTERVALS_MS, config.getRetryIntervalsMs()); assertArrayEquals(RETRY_INTERVALS_MS, config.getRetryIntervalsMillis());
assertEquals(MAX_MTU, config.getMaxMtu()); assertEquals(MAX_MTU, config.getMaxMtu());
} }

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 { public void setUp() throws Exception {
super.setUp(); super.setUp();
mFirstRetryInterval = mConfig.getRetryIntervalsMs()[0]; mFirstRetryInterval = mConfig.getRetryIntervalsMillis()[0];
mGatewayConnection.setUnderlyingNetwork(TEST_UNDERLYING_NETWORK_RECORD_1); mGatewayConnection.setUnderlyingNetwork(TEST_UNDERLYING_NETWORK_RECORD_1);
mGatewayConnection.transitionTo(mGatewayConnection.mRetryTimeoutState); mGatewayConnection.transitionTo(mGatewayConnection.mRetryTimeoutState);