Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e34f92a authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Address API review feedback 

Change naming of getExcludeLocalRoutes and setExcludedLocalRoutes
APIs based on API review feedback.

Bug: 217742354
Test: atest FrameworksNetTests
Change-Id: Ia330b571726f93fb38dc24341cc6b748269ccb61
parent cbb2fa2f

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -25223,7 +25223,7 @@ package android.net { 
    method @NonNull public android.net.Ikev2VpnProfile.Builder setAuthPsk(@NonNull byte[]);

    method @NonNull public android.net.Ikev2VpnProfile.Builder setAuthUsernamePassword(@NonNull String, @NonNull String, @Nullable java.security.cert.X509Certificate);

    method @NonNull public android.net.Ikev2VpnProfile.Builder setBypassable(boolean);

    method @NonNull public android.net.Ikev2VpnProfile.Builder setExcludeLocalRoutes(boolean);

    method @NonNull public android.net.Ikev2VpnProfile.Builder setLocalRoutesExcluded(boolean);

    method @NonNull public android.net.Ikev2VpnProfile.Builder setMaxMtu(int);

    method @NonNull public android.net.Ikev2VpnProfile.Builder setMetered(boolean);

    method @NonNull public android.net.Ikev2VpnProfile.Builder setProxy(@Nullable android.net.ProxyInfo);
@@ -25370,7 +25370,7 @@ package android.net { 
  }















  public abstract class PlatformVpnProfile {













    method public final boolean getExcludeLocalRoutes();













    method public final boolean areLocalRoutesExcluded();















    method public final boolean getRequiresInternetValidation();















    method public final int getType();















    method @NonNull public final String getTypeString();

























core/java/android/net/Ikev2VpnProfile.java



+3
−2




























Original line number
Diff line number
Diff line








@@ -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;















        }

































core/java/android/net/PlatformVpnProfile.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -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;















    }