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

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

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

parents a591af02 c1c7087b

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;