LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Rename getVpnRequiresValidation to isVpnValidationRequired"

Browse Source
This commit is contained in:
Chiachang Wang
2022-03-03 00:10:54 +00:00
committed by Gerrit Code Review
parent f1fe8ee928 7ec6ae74c8
commit 978370cb9c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/api/module-lib-current.txt
View File

@@ -128,8 +128,8 @@ package android.net {
public final class NetworkAgentConfig implements android.os.Parcelable { public final class NetworkAgentConfig implements android.os.Parcelable {
method @Nullable public String getSubscriberId(); method @Nullable public String getSubscriberId();
method public boolean getVpnRequiresValidation();
method public boolean isBypassableVpn(); method public boolean isBypassableVpn();
method public boolean isVpnValidationRequired();
} }
public static final class NetworkAgentConfig.Builder { public static final class NetworkAgentConfig.Builder {

4
framework/src/android/net/NetworkAgentConfig.java
View File

@@ -250,7 +250,7 @@ public final class NetworkAgentConfig implements Parcelable {
/** /**
* Whether network validation should be performed for this VPN network. * Whether network validation should be performed for this VPN network.
* {@see #getVpnRequiresValidation} * {@see #isVpnValidationRequired}
* @hide * @hide
*/ */
private boolean mVpnRequiresValidation = false; private boolean mVpnRequiresValidation = false;
@@ -265,7 +265,7 @@ public final class NetworkAgentConfig implements Parcelable {
* @hide * @hide
*/ */
@SystemApi(client = MODULE_LIBRARIES) @SystemApi(client = MODULE_LIBRARIES)
public boolean getVpnRequiresValidation() { public boolean isVpnValidationRequired() {
return mVpnRequiresValidation; return mVpnRequiresValidation;
} }

2
tests/common/java/android/net/NetworkAgentConfigTest.kt
View File

@@ -88,7 +88,7 @@ class NetworkAgentConfigTest {
assertEquals("TEST_NETWORK", config.getLegacyTypeName()) assertEquals("TEST_NETWORK", config.getLegacyTypeName())
if (isAtLeastT()) { if (isAtLeastT()) {
assertTrue(config.areLocalRoutesExcludedForVpn()) assertTrue(config.areLocalRoutesExcludedForVpn())
assertTrue(config.getVpnRequiresValidation()) assertTrue(config.isVpnValidationRequired())
} }
if (isAtLeastS()) { if (isAtLeastS()) {
assertEquals(testExtraInfo, config.getLegacyExtraInfo()) assertEquals(testExtraInfo, config.getLegacyExtraInfo())