Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "API: Expose VcnControlPlaneConfig" am: bf16b6d399

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cb2e3adc988cbdb97d771b45eda9fdecf2b6383
This commit is contained in:
Yan Yan
2021-02-19 00:32:30 +00:00
committed by Automerger Merge Worker
parent c8def00f9f bf16b6d399
commit 7cccd926a9
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/api/current.txt
View File

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

2
core/java/android/net/vcn/VcnControlPlaneConfig.java
View File

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

2
core/java/android/net/vcn/VcnControlPlaneIkeConfig.java
View File

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

8
core/java/android/net/vcn/VcnGatewayConnectionConfig.java
View File

@@ -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.
*