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

Commit 663c0a66 authored by Yan Yan's avatar Yan Yan
Browse files

Clean up FLAG_EVALUATE_IPSEC_LOSS_ON_LP_NC_CHANGE 

Bug: 323238888
Test: atest FrameworksVcnTests && atest CtsVcnTestCases
Flag: EXEMPT flag cleanup
Change-Id: I18a6c5b32806b6cd20bfa6b5b475d220be975a7c
parent 3646da88

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

+0 −7
Original line number Diff line number Diff line
@@ -29,10 +29,3 @@ flag{ 
    description: "Trigger network validation when IPsec packet loss exceeds the threshold"

    bug: "329139898"

}
 
 No newline at end of file
 


flag{

    name: "evaluate_ipsec_loss_on_lp_nc_change"

    namespace: "vcn"

    description: "Re-evaluate IPsec packet loss on LinkProperties or NetworkCapabilities change"

    bug: "323238888"

}
 
 No newline at end of file

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

+4 −9
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.net.IpSecTransform; 
import android.net.LinkProperties;

import android.net.Network;

import android.net.NetworkCapabilities;

import android.net.vcn.Flags;

import android.net.vcn.VcnManager;

import android.net.vcn.VcnUnderlyingNetworkTemplate;

import android.os.Handler;
@@ -297,12 +296,10 @@ public class UnderlyingNetworkEvaluator { 
        updatePriorityClass(

                underlyingNetworkTemplates, subscriptionGroup, lastSnapshot, carrierConfig);



        if (Flags.evaluateIpsecLossOnLpNcChange()) {

        for (NetworkMetricMonitor monitor : mMetricMonitors) {

            monitor.onLinkPropertiesOrCapabilitiesChanged();

        }

    }

    }



    /** Set the LinkProperties */

    public void setLinkProperties(
@@ -316,12 +313,10 @@ public class UnderlyingNetworkEvaluator { 
        updatePriorityClass(

                underlyingNetworkTemplates, subscriptionGroup, lastSnapshot, carrierConfig);



        if (Flags.evaluateIpsecLossOnLpNcChange()) {

        for (NetworkMetricMonitor monitor : mMetricMonitors) {

            monitor.onLinkPropertiesOrCapabilitiesChanged();

        }

    }

    }



    /** Set whether the network is blocked */

    public void setIsBlocked(

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

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ public abstract class NetworkEvaluationTestBase { 
        MockitoAnnotations.initMocks(this);



        mSetFlagsRule.enableFlags(Flags.FLAG_VALIDATE_NETWORK_ON_IPSEC_LOSS);

        mSetFlagsRule.enableFlags(Flags.FLAG_EVALUATE_IPSEC_LOSS_ON_LP_NC_CHANGE);



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