| commit | 7b559235d660c1f6485d9d66155bed4f407f36c5 | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Thu Jan 27 10:46:32 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 27 10:46:32 2022 +0000 |
| tree | 1db0db3ae3d1a51a47595a18447e0b95ccdf1e51 | |
| parent | 11124c2106b735f6324cc4434cbd0a9b385dd39f [diff] | |
| parent | e84d7d90d3fde68ed141921b57ae53cf8db1e629 [diff] |
Expose local route exclusion API in NetworkAgentConfig am: e84d7d90d3 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962621 Change-Id: I06da5fd15d4d9732b902dfc6b9525a55d261606f
diff --git a/framework/api/module-lib-current.txt b/framework/api/module-lib-current.txt index a5afbd4..8da421d 100644 --- a/framework/api/module-lib-current.txt +++ b/framework/api/module-lib-current.txt
@@ -127,6 +127,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 setSubscriberId(@Nullable String); }
diff --git a/framework/src/android/net/NetworkAgentConfig.java b/framework/src/android/net/NetworkAgentConfig.java index 93fc379..040bf31 100644 --- a/framework/src/android/net/NetworkAgentConfig.java +++ b/framework/src/android/net/NetworkAgentConfig.java
@@ -425,8 +425,10 @@ * Sets whether the local traffic is exempted from VPN. * * @return this builder, to facilitate chaining. - * @hide TODO(184750836): Unhide once the implementation is completed. + * @hide */ + @NonNull + @SystemApi(client = MODULE_LIBRARIES) public Builder setExcludeLocalRoutesVpn(boolean excludeLocalRoutes) { mConfig.excludeLocalRouteVpn = excludeLocalRoutes; return this;