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

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

Merge "Clean up allow_disable_ipsec_loss_detector flag" into main

parents 355524bd d5be0605

core/java/android/net/vcn/flags.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -56,13 +56,3 @@ flag{ 
      purpose: PURPOSE_BUGFIX

    }

}
 
 No newline at end of file
 


flag{

    name: "allow_disable_ipsec_loss_detector"

    namespace: "vcn"

    description: "Allow disabling IPsec packet loss detector"

    bug: "336638836"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}
 
 No newline at end of file

services/core/java/com/android/server/vcn/routeselection/IpSecPacketLossDetector.java

+2 −2
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ public class IpSecPacketLossDetector extends NetworkMetricMonitor { 
        // enabled on the last one as a sample

        mInboundTransform = inboundTransform;



        if (!Flags.allowDisableIpsecLossDetector() || canStart()) {

        if (canStart()) {

            start();

        }

    }
@@ -292,7 +292,7 @@ public class IpSecPacketLossDetector extends NetworkMetricMonitor { 
            mMaxSeqNumIncreasePerSecond = getMaxSeqNumIncreasePerSecond(carrierConfig);

        }



        if (Flags.allowDisableIpsecLossDetector() && canStart() != isStarted()) {

        if (canStart() != isStarted()) {

            if (canStart()) {

                start();

            } else {

tests/vcn/java/com/android/server/vcn/routeselection/NetworkEvaluationTestBase.java

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ public abstract class NetworkEvaluationTestBase { 
        mSetFlagsRule.enableFlags(Flags.FLAG_VALIDATE_NETWORK_ON_IPSEC_LOSS);

        mSetFlagsRule.enableFlags(Flags.FLAG_EVALUATE_IPSEC_LOSS_ON_LP_NC_CHANGE);

        mSetFlagsRule.enableFlags(Flags.FLAG_HANDLE_SEQ_NUM_LEAP);

        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_DISABLE_IPSEC_LOSS_DETECTOR);



        when(mNetwork.getNetId()).thenReturn(-1);