diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2022-02-10 01:04:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-10 01:04:41 +0000 |
| commit | 1dedf4a69dd515fb3d046fcc659d31b4642ba3f1 (patch) | |
| tree | 076d0d1477cc3e3370034a8a457a47c15ca0c480 /core/java | |
| parent | b19c8212150f8cf63d8f796926a95cecdf193e81 (diff) | |
| parent | 4123af09c9acfa9fb120eabd9ac3e287d38aba72 (diff) | |
Merge "Address API review feedback" am: 4123af09c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976446
Change-Id: I50c59c529bc3e8f5a817f64f3fb0f093228b027f
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/Ikev2VpnProfile.java | 5 | ||||
| -rw-r--r-- | core/java/android/net/PlatformVpnProfile.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/net/Ikev2VpnProfile.java b/core/java/android/net/Ikev2VpnProfile.java index ec752fdbf45f..0fd3e034291b 100644 --- a/core/java/android/net/Ikev2VpnProfile.java +++ b/core/java/android/net/Ikev2VpnProfile.java @@ -547,7 +547,8 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile { if (profile.excludeLocalRoutes && !profile.isBypassable) { Log.w(TAG, "ExcludeLocalRoutes should only be set in the bypassable VPN"); } - builder.setExcludeLocalRoutes(profile.excludeLocalRoutes && profile.isBypassable); + + builder.setLocalRoutesExcluded(profile.excludeLocalRoutes && profile.isBypassable); builder.setRequiresInternetValidation(profile.requiresInternetValidation); return builder.build(); @@ -1104,7 +1105,7 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile { */ @NonNull @RequiresFeature(PackageManager.FEATURE_IPSEC_TUNNELS) - public Builder setExcludeLocalRoutes(boolean excludeLocalRoutes) { + public Builder setLocalRoutesExcluded(boolean excludeLocalRoutes) { mExcludeLocalRoutes = excludeLocalRoutes; return this; } diff --git a/core/java/android/net/PlatformVpnProfile.java b/core/java/android/net/PlatformVpnProfile.java index 8bd1c8d07017..c0fb4cf4f3dd 100644 --- a/core/java/android/net/PlatformVpnProfile.java +++ b/core/java/android/net/PlatformVpnProfile.java @@ -83,7 +83,7 @@ public abstract class PlatformVpnProfile { /** * Returns whether the local traffic is exempted from the VPN. */ - public final boolean getExcludeLocalRoutes() { + public final boolean areLocalRoutesExcluded() { return mExcludeLocalRoutes; } |