diff options
| author | 2024-11-22 02:18:57 +0000 | |
|---|---|---|
| committer | 2024-11-22 02:18:57 +0000 | |
| commit | 378d7a9cd18ea4bb62f378229dc30cbd8a44b18a (patch) | |
| tree | 09ab0dddf71c90b589be6b832661fd523193a8c7 | |
| parent | 0e113d98d2d34d383d368d773cc1e8eb48eff5a0 (diff) | |
| parent | 78d3cf2c474616f212776c84b0a66a9522713b77 (diff) | |
Merge "Only allow clearing NAT timeout when the 25Q2 flag is enabled" into main am: 78d3cf2c47
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3368438
Change-Id: I2d0f368df9333910571ce64f6d3d77bb5daf2a73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/net/vcn/VcnGatewayConnectionConfig.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java index 3219ce81c256..b270062cbffc 100644 --- a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java +++ b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java @@ -789,11 +789,17 @@ public final class VcnGatewayConnectionConfig { public Builder setMinUdpPort4500NatTimeoutSeconds( @IntRange(from = MIN_UDP_PORT_4500_NAT_TIMEOUT_SECONDS) int minUdpPort4500NatTimeoutSeconds) { - Preconditions.checkArgument( - minUdpPort4500NatTimeoutSeconds == MIN_UDP_PORT_4500_NAT_TIMEOUT_UNSET - || minUdpPort4500NatTimeoutSeconds - >= MIN_UDP_PORT_4500_NAT_TIMEOUT_SECONDS, - "Timeout must be at least 120s or MIN_UDP_PORT_4500_NAT_TIMEOUT_UNSET"); + if (Flags.mainlineVcnModuleApi()) { + Preconditions.checkArgument( + minUdpPort4500NatTimeoutSeconds == MIN_UDP_PORT_4500_NAT_TIMEOUT_UNSET + || minUdpPort4500NatTimeoutSeconds + >= MIN_UDP_PORT_4500_NAT_TIMEOUT_SECONDS, + "Timeout must be at least 120s or MIN_UDP_PORT_4500_NAT_TIMEOUT_UNSET"); + } else { + Preconditions.checkArgument( + minUdpPort4500NatTimeoutSeconds >= MIN_UDP_PORT_4500_NAT_TIMEOUT_SECONDS, + "Timeout must be at least 120s"); + } mMinUdpPort4500NatTimeoutSeconds = minUdpPort4500NatTimeoutSeconds; return this; |