diff options
| author | 2023-10-30 19:46:22 +0000 | |
|---|---|---|
| committer | 2023-10-30 19:46:22 +0000 | |
| commit | 3e1fe2baffbe838edab89808c4e777f868dfd33f (patch) | |
| tree | 455a406dddae1b5e5b9ffd91ae5a40d1219d2983 | |
| parent | a49117c947c1a5b89a6b8fc65c833049457baa6a (diff) | |
| parent | a42be6851b3e08c7892adc58162d83b3c6a48c27 (diff) | |
Merge "Expose APIs to disable VCN safe mode" into main am: a42be6851b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2803455
Change-Id: I2ecd05a56efa3f46817614b7a19dd1662155358c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/net/vcn/VcnGatewayConnectionConfig.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index fd4da0da5b54..2c01ac6c8493 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -28951,6 +28951,7 @@ package android.net.vcn { method @NonNull public long[] getRetryIntervalsMillis(); method @NonNull public java.util.List<android.net.vcn.VcnUnderlyingNetworkTemplate> getVcnUnderlyingNetworkPriorities(); 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 } @@ -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 addGatewayOption(int); 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 removeGatewayOption(int); method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setMaxMtu(@IntRange(from=0x500) int); diff --git a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java index 66e3c28c1951..779a8db433a8 100644 --- a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java +++ b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java @@ -494,7 +494,6 @@ public final class VcnGatewayConnectionConfig { * Check whether safe mode is enabled * * @see Builder#enableSafeMode(boolean) - * @hide */ @FlaggedApi(FLAG_SAFE_MODE_CONFIG) public boolean isSafeModeEnabled() { @@ -824,7 +823,6 @@ public final class VcnGatewayConnectionConfig { * networks. * * @param enabled whether safe mode should be enabled. Defaults to {@code true} - * @hide */ @FlaggedApi(FLAG_SAFE_MODE_CONFIG) @NonNull |