| commit | b54b34aa6d30a31750e78e1615a107623644b4fe | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Thu Jan 27 11:06:53 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 27 11:06:53 2022 +0000 |
| tree | 1bf8fc43e0ab06684a936325c09aaf239f217458 | |
| parent | 63b0335dae7b34a96ccaf3cffacd8a7399288fc9 [diff] | |
| parent | 3725a00155967028cd34aa63fffc262858ecfec2 [diff] |
Expose local route exclusion API in NetworkAgentConfig am: e84d7d90d3 am: 3725a00155 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962621 Change-Id: I865125fb6caf688a60d3d64548dd2ab37a871756
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;