diff options
4 files changed, 8 insertions, 8 deletions
diff --git a/framework/api/module-lib-current.txt b/framework/api/module-lib-current.txt index 92dc2f4689..fda1045dd7 100644 --- a/framework/api/module-lib-current.txt +++ b/framework/api/module-lib-current.txt @@ -132,7 +132,7 @@ package android.net { public static final class NetworkAgentConfig.Builder { method @NonNull public android.net.NetworkAgentConfig.Builder setBypassableVpn(boolean); - method @NonNull public android.net.NetworkAgentConfig.Builder setExcludeLocalRoutesVpn(boolean); + method @NonNull public android.net.NetworkAgentConfig.Builder setLocalRoutesExcludedForVpn(boolean); method @NonNull public android.net.NetworkAgentConfig.Builder setSubscriberId(@Nullable String); method @NonNull public android.net.NetworkAgentConfig.Builder setVpnRequiresValidation(boolean); } diff --git a/framework/src/android/net/NetworkAgentConfig.java b/framework/src/android/net/NetworkAgentConfig.java index 3f5d5e598a..1991a58c57 100644 --- a/framework/src/android/net/NetworkAgentConfig.java +++ b/framework/src/android/net/NetworkAgentConfig.java @@ -244,7 +244,7 @@ public final class NetworkAgentConfig implements Parcelable { * @return whether local traffic is excluded from the VPN network. * @hide */ - public boolean getExcludeLocalRouteVpn() { + public boolean areLocalRoutesExcludedForVpn() { return excludeLocalRouteVpn; } @@ -472,7 +472,7 @@ public final class NetworkAgentConfig implements Parcelable { */ @NonNull @SystemApi(client = MODULE_LIBRARIES) - public Builder setExcludeLocalRoutesVpn(boolean excludeLocalRoutes) { + public Builder setLocalRoutesExcludedForVpn(boolean excludeLocalRoutes) { mConfig.excludeLocalRouteVpn = excludeLocalRoutes; return this; } diff --git a/tests/common/java/android/net/NetworkAgentConfigTest.kt b/tests/common/java/android/net/NetworkAgentConfigTest.kt index 11d3ba02d0..e5db09fc4b 100644 --- a/tests/common/java/android/net/NetworkAgentConfigTest.kt +++ b/tests/common/java/android/net/NetworkAgentConfigTest.kt @@ -51,7 +51,7 @@ class NetworkAgentConfigTest { setBypassableVpn(true) } if (isAtLeastT()) { - setExcludeLocalRoutesVpn(true) + setLocalRoutesExcludedForVpn(true) setVpnRequiresValidation(true) } }.build() @@ -75,7 +75,7 @@ class NetworkAgentConfigTest { setBypassableVpn(true) } if (isAtLeastT()) { - setExcludeLocalRoutesVpn(true) + setLocalRoutesExcludedForVpn(true) setVpnRequiresValidation(true) } }.build() @@ -87,7 +87,7 @@ class NetworkAgentConfigTest { assertTrue(config.isUnvalidatedConnectivityAcceptable()) assertEquals("TEST_NETWORK", config.getLegacyTypeName()) if (isAtLeastT()) { - assertTrue(config.getExcludeLocalRouteVpn()) + assertTrue(config.areLocalRoutesExcludedForVpn()) assertTrue(config.getVpnRequiresValidation()) } if (isAtLeastS()) { diff --git a/tests/unit/java/android/net/Ikev2VpnProfileTest.java b/tests/unit/java/android/net/Ikev2VpnProfileTest.java index a151f0392e..c3d3bf7827 100644 --- a/tests/unit/java/android/net/Ikev2VpnProfileTest.java +++ b/tests/unit/java/android/net/Ikev2VpnProfileTest.java @@ -270,11 +270,11 @@ public class Ikev2VpnProfileTest { public void testBuildExcludeLocalRoutesSet() throws Exception { final Ikev2VpnProfile.Builder builder = getBuilderWithDefaultOptions(); builder.setAuthPsk(PSK_BYTES); - builder.setExcludeLocalRoutes(true); + builder.setLocalRoutesExcluded(true); final Ikev2VpnProfile profile = builder.build(); assertNotNull(profile); - assertTrue(profile.getExcludeLocalRoutes()); + assertTrue(profile.areLocalRoutesExcluded()); builder.setBypassable(false); try { |