commit 5ea7f1eb32e36a2179958fe21f1c74ec41113354
author Chiachang Wang <chiachangwang@google.com> Thu Feb 10 01:39:12 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 10 01:39:12 2022 +0000
tree ecec6cbeef680a9e8e82034c107e19789cd05ed4
parent b6e49a9cb4a588242c0be2a2f168c93eec15606f
parent c1ae7a1047556c8db0d4e2091b6de5ff2455cf93

Merge "Change naming of excludeLocalRoutes" am: 84ad04f768 am: c1ae7a1047

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976348

Change-Id: If7d654a347b562859389a171c1d36b82580f2038

framework/api/module-lib-current.txt

diff --git a/framework/api/module-lib-current.txt b/framework/api/module-lib-current.txt
index 92dc2f4..fda1045 100644
--- a/framework/api/module-lib-current.txt
+++ b/framework/api/module-lib-current.txt
@@ -132,7 +132,7 @@
 
   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);
   }

framework/src/android/net/NetworkAgentConfig.java

diff --git a/framework/src/android/net/NetworkAgentConfig.java b/framework/src/android/net/NetworkAgentConfig.java
index 3f5d5e5..1991a58 100644
--- a/framework/src/android/net/NetworkAgentConfig.java
+++ b/framework/src/android/net/NetworkAgentConfig.java
@@ -244,7 +244,7 @@
      * @return whether local traffic is excluded from the VPN network.
      * @hide
      */
-    public boolean getExcludeLocalRouteVpn() {
+    public boolean areLocalRoutesExcludedForVpn() {
         return excludeLocalRouteVpn;
     }
 
@@ -472,7 +472,7 @@
          */
         @NonNull
         @SystemApi(client = MODULE_LIBRARIES)
-        public Builder setExcludeLocalRoutesVpn(boolean excludeLocalRoutes) {
+        public Builder setLocalRoutesExcludedForVpn(boolean excludeLocalRoutes) {
             mConfig.excludeLocalRouteVpn = excludeLocalRoutes;
             return this;
         }

tests/common/java/android/net/NetworkAgentConfigTest.kt

diff --git a/tests/common/java/android/net/NetworkAgentConfigTest.kt b/tests/common/java/android/net/NetworkAgentConfigTest.kt
index 11d3ba0..e5db09f 100644
--- a/tests/common/java/android/net/NetworkAgentConfigTest.kt
+++ b/tests/common/java/android/net/NetworkAgentConfigTest.kt
@@ -51,7 +51,7 @@
                 setBypassableVpn(true)
             }
             if (isAtLeastT()) {
-                setExcludeLocalRoutesVpn(true)
+                setLocalRoutesExcludedForVpn(true)
                 setVpnRequiresValidation(true)
             }
         }.build()
@@ -75,7 +75,7 @@
                 setBypassableVpn(true)
             }
             if (isAtLeastT()) {
-                setExcludeLocalRoutesVpn(true)
+                setLocalRoutesExcludedForVpn(true)
                 setVpnRequiresValidation(true)
             }
         }.build()
@@ -87,7 +87,7 @@
         assertTrue(config.isUnvalidatedConnectivityAcceptable())
         assertEquals("TEST_NETWORK", config.getLegacyTypeName())
         if (isAtLeastT()) {
-            assertTrue(config.getExcludeLocalRouteVpn())
+            assertTrue(config.areLocalRoutesExcludedForVpn())
             assertTrue(config.getVpnRequiresValidation())
         }
         if (isAtLeastS()) {

tests/unit/java/android/net/Ikev2VpnProfileTest.java

diff --git a/tests/unit/java/android/net/Ikev2VpnProfileTest.java b/tests/unit/java/android/net/Ikev2VpnProfileTest.java
index a151f03..c3d3bf7 100644
--- a/tests/unit/java/android/net/Ikev2VpnProfileTest.java
+++ b/tests/unit/java/android/net/Ikev2VpnProfileTest.java
@@ -270,11 +270,11 @@
     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 {