Merge "API: Expose VcnControlPlaneConfig" (bf16b6d3) · Commits · e / os / android_frameworks_base

core/api/current.txt

+10 −1

Original line number	Diff line number	Diff line
		@@ -26113,6 +26113,15 @@ package android.net.vcn {
		method @NonNull public android.net.vcn.VcnConfig build();
		}

		public abstract class VcnControlPlaneConfig {
		}

		public final class VcnControlPlaneIkeConfig extends android.net.vcn.VcnControlPlaneConfig {
		ctor public VcnControlPlaneIkeConfig(@NonNull android.net.ipsec.ike.IkeSessionParams, @NonNull android.net.ipsec.ike.TunnelModeChildSessionParams);
		method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams getChildSessionParams();
		method @NonNull public android.net.ipsec.ike.IkeSessionParams getIkeSessionParams();
		}

		public final class VcnGatewayConnectionConfig {
		method @NonNull public int[] getExposedCapabilities();
		method @IntRange(from=android.net.vcn.VcnGatewayConnectionConfig.MIN_MTU_V6) public int getMaxMtu();
		@@ -26121,7 +26130,7 @@ package android.net.vcn {
		}

		public static final class VcnGatewayConnectionConfig.Builder {
		ctor public VcnGatewayConnectionConfig.Builder();
		ctor public VcnGatewayConnectionConfig.Builder(@NonNull android.net.vcn.VcnControlPlaneConfig);
		method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder addExposedCapability(int);
		method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder addRequiredUnderlyingCapability(int);
		method @NonNull public android.net.vcn.VcnGatewayConnectionConfig build();

+0 −2

Original line number	Diff line number	Diff line
		@@ -35,8 +35,6 @@ import java.util.Objects;
		*
		* @see VcnManager
		* @see VcnGatewayConnectionConfig
		*
		* @hide
		*/
		public abstract class VcnControlPlaneConfig {
		/** @hide */

+0 −2

Original line number	Diff line number	Diff line
		@@ -34,8 +34,6 @@ import java.util.Objects;
		* configuration, authentication and authorization parameters.
		*
		* @see VcnControlPlaneConfig
		*
		* @hide
		*/
		public final class VcnControlPlaneIkeConfig extends VcnControlPlaneConfig {
		private static final String TAG = VcnControlPlaneIkeConfig.class.getSimpleName();

+0 −8

Original line number	Diff line number	Diff line
		@@ -420,7 +420,6 @@ public final class VcnGatewayConnectionConfig {
		*
		* @param ctrlPlaneConfig the control plane configuration
		* @see VcnControlPlaneConfig
		* @hide
		*/
		public Builder(@NonNull VcnControlPlaneConfig ctrlPlaneConfig) {
		Objects.requireNonNull(ctrlPlaneConfig, "ctrlPlaneConfig was null");
		@@ -428,13 +427,6 @@ public final class VcnGatewayConnectionConfig {
		mCtrlPlaneConfig = ctrlPlaneConfig;
		}

		/** Construct a Builder object. */
		// TODO: Remove this constructor when #Builder(ctrlPlaneConfig) is exposed as public API.
		// This constructor is created to avoid changing API shape in this CL
		public Builder() {
		mCtrlPlaneConfig = null;
		}

		/**
		* Add a capability that this VCN Gateway Connection will support.
		*