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

Commit a42be685 authored by Yan Yan's avatar Yan Yan Committed by Gerrit Code Review
Browse files

Merge "Expose APIs to disable VCN safe mode" into main

parents 7c342823 c5e079a7

core/api/current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -28951,6 +28951,7 @@ package android.net.vcn { 
    method @NonNull public long[] getRetryIntervalsMillis();

    method @NonNull public long[] getRetryIntervalsMillis();

    method @NonNull public java.util.List<android.net.vcn.VcnUnderlyingNetworkTemplate> getVcnUnderlyingNetworkPriorities();

    method @NonNull public java.util.List<android.net.vcn.VcnUnderlyingNetworkTemplate> getVcnUnderlyingNetworkPriorities();

    method public boolean hasGatewayOption(int);

    method public boolean hasGatewayOption(int);

    method @FlaggedApi("android.net.vcn.safe_mode_config") public boolean isSafeModeEnabled();

    field public static final int VCN_GATEWAY_OPTION_ENABLE_DATA_STALL_RECOVERY_WITH_MOBILITY = 0; // 0x0

    field public static final int VCN_GATEWAY_OPTION_ENABLE_DATA_STALL_RECOVERY_WITH_MOBILITY = 0; // 0x0

  }

  }















@@ -28959,6 +28960,7 @@ package android.net.vcn {









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







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











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







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














    method @FlaggedApi("android.net.vcn.safe_mode_config") @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder enableSafeMode(boolean);











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







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











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







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











    method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setMaxMtu(@IntRange(from=0x500) int);







    method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setMaxMtu(@IntRange(from=0x500) int);

























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



+0
−2




























Original line number
Original line
Diff line number
Diff line








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









     * Check whether safe mode is enabled







     * Check whether safe mode is enabled











     *







     *











     * @see Builder#enableSafeMode(boolean)







     * @see Builder#enableSafeMode(boolean)











     * @hide














     */







     */











    @FlaggedApi(FLAG_SAFE_MODE_CONFIG)







    @FlaggedApi(FLAG_SAFE_MODE_CONFIG)











    public boolean isSafeModeEnabled() {







    public boolean isSafeModeEnabled() {










@@ -824,7 +823,6 @@ public final class VcnGatewayConnectionConfig {









         * networks.







         * networks.











         *







         *











         * @param enabled whether safe mode should be enabled. Defaults to {@code true}







         * @param enabled whether safe mode should be enabled. Defaults to {@code true}











         * @hide














         */







         */











        @FlaggedApi(FLAG_SAFE_MODE_CONFIG)







        @FlaggedApi(FLAG_SAFE_MODE_CONFIG)











        @NonNull







        @NonNull