commit c1c7087b11e0c49ecf7ff5a354af5808c5c26104
author Yan Yan <evitayan@google.com> Wed Nov 20 11:42:40 2024 -0800
committer Yan Yan <evitayan@google.com> Wed Nov 20 22:02:34 2024 +0000
tree 87a28c406e08d917c8a06dadb997caef68b34739
parent bc4367dfce09ed3ab921ab80c0277ea668f3e6d5

Only allow clearing NAT timeout when the 25Q2 flag is enabled

This commit flags off the API behavior change that was meant to
be added only to 25Q2, but was introduced to older SDKs and caused
released CTS to fail.

Bug: 379947714
Test: atest FrameworksVcnTests && atest CtsVcnTestCases
Test: verified against Android15 CTS
Flag: android.net.vcn.mainline_vcn_module_api
Change-Id: I39d33fa80225b138d64f18819eff07f5ef156dd1

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

diff --git a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
index 3219ce8..b270062 100644
--- a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
+++ b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
@@ -789,11 +789,17 @@
         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;