diff options
4 files changed, 11 insertions, 9 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 70cf99432869..af58174ff9a2 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -28963,12 +28963,12 @@ package android.net.vcn { method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder addExposedCapability(int); method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder addGatewayOption(int); method @NonNull public android.net.vcn.VcnGatewayConnectionConfig build(); - method @FlaggedApi("android.net.vcn.safe_mode_config") @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder enableSafeMode(boolean); method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder removeExposedCapability(int); method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder removeGatewayOption(int); method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setMaxMtu(@IntRange(from=0x500) int); method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setMinUdpPort4500NatTimeoutSeconds(@IntRange(from=0x78) int); method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setRetryIntervalsMillis(@NonNull long[]); + method @FlaggedApi("android.net.vcn.safe_mode_config") @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setSafeModeEnabled(boolean); method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setVcnUnderlyingNetworkPriorities(@NonNull java.util.List<android.net.vcn.VcnUnderlyingNetworkTemplate>); } diff --git a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java index 779a8db433a8..6f11d3ae661c 100644 --- a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java +++ b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java @@ -493,7 +493,7 @@ public final class VcnGatewayConnectionConfig { /** * Check whether safe mode is enabled * - * @see Builder#enableSafeMode(boolean) + * @see Builder#setSafeModeEnabled(boolean) */ @FlaggedApi(FLAG_SAFE_MODE_CONFIG) public boolean isSafeModeEnabled() { @@ -815,8 +815,8 @@ public final class VcnGatewayConnectionConfig { * * <p>If a VCN fails to provide connectivity within a system-provided timeout, it will enter * safe mode. In safe mode, the VCN Network will be torn down and the system will restore - * connectivity by allowing underlying cellular networks to be used as default. At the same - * time, VCN will continue to retry until it succeeds. + * connectivity by allowing underlying cellular or WiFi networks to be used as default. At + * the same time, VCN will continue to retry until it succeeds. * * <p>When safe mode is disabled and VCN connection fails to provide connectivity, end users * might not have connectivity, and may not have access to carrier-owned underlying @@ -826,7 +826,7 @@ public final class VcnGatewayConnectionConfig { */ @FlaggedApi(FLAG_SAFE_MODE_CONFIG) @NonNull - public Builder enableSafeMode(boolean enabled) { + public Builder setSafeModeEnabled(boolean enabled) { mIsSafeModeDisabled = !enabled; return this; } diff --git a/tests/vcn/java/android/net/vcn/VcnGatewayConnectionConfigTest.java b/tests/vcn/java/android/net/vcn/VcnGatewayConnectionConfigTest.java index cb3782173dc8..59dc68900100 100644 --- a/tests/vcn/java/android/net/vcn/VcnGatewayConnectionConfigTest.java +++ b/tests/vcn/java/android/net/vcn/VcnGatewayConnectionConfigTest.java @@ -313,7 +313,8 @@ public class VcnGatewayConnectionConfigTest { @Test public void testBuilderAndGettersSafeModeDisabled() { - final VcnGatewayConnectionConfig config = newBuilderMinimal().enableSafeMode(false).build(); + final VcnGatewayConnectionConfig config = + newBuilderMinimal().setSafeModeEnabled(false).build(); assertFalse(config.isSafeModeEnabled()); } @@ -335,7 +336,8 @@ public class VcnGatewayConnectionConfigTest { @Test public void testPersistableBundleSafeModeDisabled() { - final VcnGatewayConnectionConfig config = newBuilderMinimal().enableSafeMode(false).build(); + final VcnGatewayConnectionConfig config = + newBuilderMinimal().setSafeModeEnabled(false).build(); assertEquals(config, new VcnGatewayConnectionConfig(config.toPersistableBundle())); } @@ -456,7 +458,7 @@ public class VcnGatewayConnectionConfigTest { assertEquals(config.isSafeModeEnabled(), configEqual.isSafeModeEnabled()); final VcnGatewayConnectionConfig configNotEqual = - newBuilderMinimal().enableSafeMode(false).build(); + newBuilderMinimal().setSafeModeEnabled(false).build(); assertEquals(config, configEqual); assertNotEquals(config, configNotEqual); diff --git a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java index bf73198d1006..f84616426389 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java +++ b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java @@ -661,7 +661,7 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection throws Exception { final VcnGatewayConnectionConfig config = VcnGatewayConnectionConfigTest.newTestBuilderMinimal() - .enableSafeMode(safeModeEnabledByCaller) + .setSafeModeEnabled(safeModeEnabledByCaller) .build(); final VcnGatewayConnection.Dependencies deps = mock(VcnGatewayConnection.Dependencies.class); |