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

Commit 8a26f53a authored Jan 27, 2022 by Chiachang Wang Committed by Automerger Merge Worker Jan 27, 2022

Merge "Expose local route exclusion APIs" am: 377dd020

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1962799

Change-Id: I53f7d4726ca00850ca06661ea6c0ab1135bf9b4a

parents 5f01f6cb 377dd020

core/api/current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25223,6 +25223,7 @@ package android.net {
	method @NonNull public android.net.Ikev2VpnProfile.Builder setAuthPsk(@NonNull byte[]);		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 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 setBypassable(boolean);
			method @NonNull public android.net.Ikev2VpnProfile.Builder setExcludeLocalRoutes(boolean);
	method @NonNull public android.net.Ikev2VpnProfile.Builder setMaxMtu(int);		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 setMetered(boolean);
	method @NonNull public android.net.Ikev2VpnProfile.Builder setProxy(@Nullable android.net.ProxyInfo);		method @NonNull public android.net.Ikev2VpnProfile.Builder setProxy(@Nullable android.net.ProxyInfo);
	@@ -25368,6 +25369,7 @@ package android.net {
	}		}

	public abstract class PlatformVpnProfile {		public abstract class PlatformVpnProfile {
			method public final boolean getExcludeLocalRoutes();
	method public final int getType();		method public final int getType();
	method @NonNull public final String getTypeString();		method @NonNull public final String getTypeString();
	field public static final int TYPE_IKEV2_IPSEC_PSK = 7; // 0x7		field public static final int TYPE_IKEV2_IPSEC_PSK = 7; // 0x7

core/java/android/net/Ikev2VpnProfile.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1071,8 +1071,6 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
	*		*
	* Note that because the local traffic will always bypass the VPN,		* Note that because the local traffic will always bypass the VPN,
	* it is not possible to set this flag on a non-bypassable VPN.		* it is not possible to set this flag on a non-bypassable VPN.
	*
	* @hide TODO(184750836): unhide once the implementation is completed
	*/		*/
	@NonNull		@NonNull
	@RequiresFeature(PackageManager.FEATURE_IPSEC_TUNNELS)		@RequiresFeature(PackageManager.FEATURE_IPSEC_TUNNELS)

core/java/android/net/PlatformVpnProfile.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -83,8 +83,6 @@ public abstract class PlatformVpnProfile {

	/**		/**
	* Returns if the local traffic is exempted from the VPN.		* Returns if the local traffic is exempted from the VPN.
	*
	* @hide TODO(184750836): unhide once the implementation is completed
	*/		*/
	public final boolean getExcludeLocalRoutes() {		public final boolean getExcludeLocalRoutes() {
	return mExcludeLocalRoutes;		return mExcludeLocalRoutes;