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

Commit 9236bf7e authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "API: Expose VcnControlPlaneConfig" am: bf16b6d3 am: 7cccd926 am: 6bbb6b77 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a759a0d34efb81998d9dfb070a59eefbab642c0
parents 1a0c0a51 6bbb6b77

core/api/current.txt

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

    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 {







  public final class VcnGatewayConnectionConfig {











    method @NonNull public int[] getExposedCapabilities();







    method @NonNull public int[] getExposedCapabilities();











    method @IntRange(from=android.net.vcn.VcnGatewayConnectionConfig.MIN_MTU_V6) public int getMaxMtu();







    method @IntRange(from=android.net.vcn.VcnGatewayConnectionConfig.MIN_MTU_V6) public int getMaxMtu();









@@ -26994,7 +27003,7 @@ package android.net.vcn {









  }







  }



























  public static final class VcnGatewayConnectionConfig.Builder {







  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 addExposedCapability(int);











    method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder addRequiredUnderlyingCapability(int);







    method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder addRequiredUnderlyingCapability(int);











    method @NonNull public android.net.vcn.VcnGatewayConnectionConfig build();







    method @NonNull public android.net.vcn.VcnGatewayConnectionConfig build();

























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



+0
−2




























Original line number
Original line
Diff line number
Diff line








@@ -35,8 +35,6 @@ import java.util.Objects;









 *







 *











 * @see VcnManager







 * @see VcnManager











 * @see VcnGatewayConnectionConfig







 * @see VcnGatewayConnectionConfig











 *














 * @hide














 */







 */











public abstract class VcnControlPlaneConfig {







public abstract class VcnControlPlaneConfig {











    /** @hide */







    /** @hide */

































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



+0
−2




























Original line number
Original line
Diff line number
Diff line








@@ -34,8 +34,6 @@ import java.util.Objects;









 * configuration, authentication and authorization parameters.







 * configuration, authentication and authorization parameters.











 *







 *











 * @see VcnControlPlaneConfig







 * @see VcnControlPlaneConfig











 *














 * @hide














 */







 */











public final class VcnControlPlaneIkeConfig extends VcnControlPlaneConfig {







public final class VcnControlPlaneIkeConfig extends VcnControlPlaneConfig {











    private static final String TAG = VcnControlPlaneIkeConfig.class.getSimpleName();







    private static final String TAG = VcnControlPlaneIkeConfig.class.getSimpleName();

































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



+0
−8




























Original line number
Original line
Diff line number
Diff line








@@ -420,7 +420,6 @@ public final class VcnGatewayConnectionConfig {









         *







         *











         * @param ctrlPlaneConfig the control plane configuration







         * @param ctrlPlaneConfig the control plane configuration











         * @see VcnControlPlaneConfig







         * @see VcnControlPlaneConfig











         * @hide














         */







         */











        public Builder(@NonNull VcnControlPlaneConfig ctrlPlaneConfig) {







        public Builder(@NonNull VcnControlPlaneConfig ctrlPlaneConfig) {











            Objects.requireNonNull(ctrlPlaneConfig, "ctrlPlaneConfig was null");







            Objects.requireNonNull(ctrlPlaneConfig, "ctrlPlaneConfig was null");









@@ -428,13 +427,6 @@ public final class VcnGatewayConnectionConfig {









            mCtrlPlaneConfig = ctrlPlaneConfig;







            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.







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











         *







         *