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

Commit 378d7a9c authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Only allow clearing NAT timeout when the 25Q2 flag is enabled" into main am: 78d3cf2c 

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



Change-Id: I2d0f368df9333910571ce64f6d3d77bb5daf2a73
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e113d98 78d3cf2c

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

+11 −5
Original line number Diff line number Diff line
@@ -789,11 +789,17 @@ public final class VcnGatewayConnectionConfig { 
        public Builder setMinUdpPort4500NatTimeoutSeconds(

                @IntRange(from = MIN_UDP_PORT_4500_NAT_TIMEOUT_SECONDS)

                        int minUdpPort4500NatTimeoutSeconds) {

            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;