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

Commit afc550f3 authored by Yan Yan's avatar Yan Yan
Browse files

API: Expose VcnControlPlaneConfig 

Each VcnGatewayConnectionConfig must have a VcnControlPlaneConfig
that contains all connection, authentication and authorization
parameters required to establish a gateway connection.

Bug: 163604823
Test: make update-api && make
Change-Id: If4a58e7b0391b485ee7c4482d422bec5e6ba4148
parent a9c1bab8

core/api/current.txt

+10 −1
Original line number Diff line number Diff line
@@ -26112,6 +26112,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();









@@ -26120,7 +26129,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();

























core/java/android/net/vcn/VcnControlPlaneConfig.java



+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 */

































core/java/android/net/vcn/VcnControlPlaneIkeConfig.java



+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();

































core/java/android/net/vcn/VcnGatewayConnectionConfig.java



+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.















         *