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

Commit 52f27e61 authored by Yan Yan's avatar Yan Yan
Browse files

Clean up FLAG_VALIDATE_NETWORK_ON_IPSEC_LOSS 

This CL also fixes incorrect code comments

Bug: 329139898
Test: atest FrameworksVcnTests && atest CtsVcnTestCases
Flag: EXEMPT flag cleanup
Change-Id: Ib61dfbf9c3e147766530dbc519a785b8b13fac9d
parent 663c0a66

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

+0 −7
Original line number Diff line number Diff line
@@ -22,10 +22,3 @@ flag{ 
    description: "Feature flag for enabling network metric monitor"

    bug: "282996138"

}
 
 No newline at end of file
 


flag{

    name: "validate_network_on_ipsec_loss"

    namespace: "vcn"

    description: "Trigger network validation when IPsec packet loss exceeds the threshold"

    bug: "329139898"

}
 
 No newline at end of file

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

+4 −8
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.content.IntentFilter; 
import android.net.ConnectivityManager;

import android.net.IpSecTransformState;

import android.net.Network;

import android.net.vcn.Flags;

import android.net.vcn.VcnManager;

import android.os.Handler;

import android.os.HandlerExecutor;
@@ -436,15 +435,12 @@ public class IpSecPacketLossDetector extends NetworkMetricMonitor { 
                onValidationResultReceivedInternal(true /* isFailed */);

            }



            // In both "valid" or "unusual_seq_num_leap" cases, trigger network validation

            if (Flags.validateNetworkOnIpsecLoss()) {

                // Trigger re-validation of the underlying network; if it fails, the VCN will

                // attempt to migrate away.

            // In both "invalid" and "unusual_seq_num_leap" cases, trigger network validation. If

            // validation fails, the VCN will attempt to migrate away.

            mConnectivityManager.reportNetworkConnectivity(

                    getNetwork(), false /* hasConnectivity */);

        }

    }

    }



    @VisibleForTesting(visibility = Visibility.PRIVATE)

    public static class PacketLossCalculator {

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

+0 −7
Original line number Diff line number Diff line
@@ -34,14 +34,12 @@ import android.net.Network; 
import android.net.NetworkCapabilities;

import android.net.TelephonyNetworkSpecifier;

import android.net.vcn.FeatureFlags;

import android.net.vcn.Flags;

import android.os.Handler;

import android.os.IPowerManager;

import android.os.IThermalService;

import android.os.ParcelUuid;

import android.os.PowerManager;

import android.os.test.TestLooper;

import android.platform.test.flag.junit.SetFlagsRule;

import android.telephony.TelephonyManager;



import com.android.server.vcn.TelephonySubscriptionTracker.TelephonySubscriptionSnapshot;
@@ -49,7 +47,6 @@ import com.android.server.vcn.VcnContext; 
import com.android.server.vcn.VcnNetworkProvider;



import org.junit.Before;

import org.junit.Rule;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;
@@ -57,8 +54,6 @@ import java.util.Set; 
import java.util.UUID;



public abstract class NetworkEvaluationTestBase {

    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();



    protected static final String SSID = "TestWifi";

    protected static final String SSID_OTHER = "TestWifiOther";

    protected static final String PLMN_ID = "123456";
@@ -120,8 +115,6 @@ public abstract class NetworkEvaluationTestBase { 
    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);



        mSetFlagsRule.enableFlags(Flags.FLAG_VALIDATE_NETWORK_ON_IPSEC_LOSS);



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



        mTestLooper = new TestLooper();