Merge "Rename enableSafeMode to setSafeModeEnabled" into main am: dae429138a am: df349f0309 (85e0c785) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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 addExposedCapability(int);
	method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder addGatewayOption(int);		method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder addGatewayOption(int);
	method @NonNull public android.net.vcn.VcnGatewayConnectionConfig build();		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 removeExposedCapability(int);
	method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder removeGatewayOption(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 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 setMinUdpPort4500NatTimeoutSeconds(@IntRange(from=0x78) int);
	method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setRetryIntervalsMillis(@NonNull long[]);		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>);		method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setVcnUnderlyingNetworkPriorities(@NonNull java.util.List<android.net.vcn.VcnUnderlyingNetworkTemplate>);
	}		}

core/java/android/net/vcn/VcnGatewayConnectionConfig.java

+4 −4

tests/vcn/java/android/net/vcn/VcnGatewayConnectionConfigTest.java

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -313,7 +313,8 @@ public class VcnGatewayConnectionConfigTest {

	@Test		@Test
	public void testBuilderAndGettersSafeModeDisabled() {		public void testBuilderAndGettersSafeModeDisabled() {
	final VcnGatewayConnectionConfig config = newBuilderMinimal().enableSafeMode(false).build();		final VcnGatewayConnectionConfig config =
			newBuilderMinimal().setSafeModeEnabled(false).build();

	assertFalse(config.isSafeModeEnabled());		assertFalse(config.isSafeModeEnabled());
	}		}
	@@ -335,7 +336,8 @@ public class VcnGatewayConnectionConfigTest {

	@Test		@Test
	public void testPersistableBundleSafeModeDisabled() {		public void testPersistableBundleSafeModeDisabled() {
	final VcnGatewayConnectionConfig config = newBuilderMinimal().enableSafeMode(false).build();		final VcnGatewayConnectionConfig config =
			newBuilderMinimal().setSafeModeEnabled(false).build();

	assertEquals(config, new VcnGatewayConnectionConfig(config.toPersistableBundle()));		assertEquals(config, new VcnGatewayConnectionConfig(config.toPersistableBundle()));
	}		}
	@@ -456,7 +458,7 @@ public class VcnGatewayConnectionConfigTest {
	assertEquals(config.isSafeModeEnabled(), configEqual.isSafeModeEnabled());		assertEquals(config.isSafeModeEnabled(), configEqual.isSafeModeEnabled());

	final VcnGatewayConnectionConfig configNotEqual =		final VcnGatewayConnectionConfig configNotEqual =
	newBuilderMinimal().enableSafeMode(false).build();		newBuilderMinimal().setSafeModeEnabled(false).build();

	assertEquals(config, configEqual);		assertEquals(config, configEqual);
	assertNotEquals(config, configNotEqual);		assertNotEquals(config, configNotEqual);

tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -661,7 +661,7 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection
	throws Exception {		throws Exception {
	final VcnGatewayConnectionConfig config =		final VcnGatewayConnectionConfig config =
	VcnGatewayConnectionConfigTest.newTestBuilderMinimal()		VcnGatewayConnectionConfigTest.newTestBuilderMinimal()
	.enableSafeMode(safeModeEnabledByCaller)		.setSafeModeEnabled(safeModeEnabledByCaller)
	.build();		.build();
	final VcnGatewayConnection.Dependencies deps =		final VcnGatewayConnection.Dependencies deps =
	mock(VcnGatewayConnection.Dependencies.class);		mock(VcnGatewayConnection.Dependencies.class);

Original line number	Original line	Diff line number	Diff line
	@@ -493,7 +493,7 @@ public final class VcnGatewayConnectionConfig {
	/**		/**
	* Check whether safe mode is enabled		* Check whether safe mode is enabled
	*		*
	* @see Builder#enableSafeMode(boolean)		* @see Builder#setSafeModeEnabled(boolean)
	*/		*/
	@FlaggedApi(FLAG_SAFE_MODE_CONFIG)		@FlaggedApi(FLAG_SAFE_MODE_CONFIG)
	public boolean isSafeModeEnabled() {		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		* <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		* 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		* connectivity by allowing underlying cellular or WiFi networks to be used as default. At
	* time, VCN will continue to retry until it succeeds.		* 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		* <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		* 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)		@FlaggedApi(FLAG_SAFE_MODE_CONFIG)
	@NonNull		@NonNull
	public Builder enableSafeMode(boolean enabled) {		public Builder setSafeModeEnabled(boolean enabled) {
	mIsSafeModeDisabled = !enabled;		mIsSafeModeDisabled = !enabled;
	return this;		return this;
	}		}