joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Clean up FLAG_EVALUATE_IPSEC_LOSS_ON_LP_NC_CHANGE

Browse source 
Bug: 323238888
Test: atest FrameworksVcnTests && atest CtsVcnTestCases
Flag: EXEMPT flag cleanup
Change-Id: I18a6c5b32806b6cd20bfa6b5b475d220be975a7c
This commit is contained in:
Yan Yan 2024-10-10 11:53:55 -07:00
commit aa3971b14c
3 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Vcn/flags/flags.aconfig
View file

@ -28,11 +28,4 @@ flag{
namespace: "vcn"
description: "Trigger network validation when IPsec packet loss exceeds the threshold"
bug: "329139898"
}
flag{
name: "evaluate_ipsec_loss_on_lp_nc_change"
namespace: "vcn"
description: "Re-evaluate IPsec packet loss on LinkProperties or NetworkCapabilities change"
bug: "323238888"
}

13
Vcn/service-b/src/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluator.java
View file

@ -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,10 +296,8 @@ public class UnderlyingNetworkEvaluator {
updatePriorityClass(
underlyingNetworkTemplates, subscriptionGroup, lastSnapshot, carrierConfig);
if (Flags.evaluateIpsecLossOnLpNcChange()) {
for (NetworkMetricMonitor monitor : mMetricMonitors) {
monitor.onLinkPropertiesOrCapabilitiesChanged();
}
for (NetworkMetricMonitor monitor : mMetricMonitors) {
monitor.onLinkPropertiesOrCapabilitiesChanged();
}
}
@ -316,10 +313,8 @@ public class UnderlyingNetworkEvaluator {
updatePriorityClass(
underlyingNetworkTemplates, subscriptionGroup, lastSnapshot, carrierConfig);
if (Flags.evaluateIpsecLossOnLpNcChange()) {
for (NetworkMetricMonitor monitor : mMetricMonitors) {
monitor.onLinkPropertiesOrCapabilitiesChanged();
}
for (NetworkMetricMonitor monitor : mMetricMonitors) {
monitor.onLinkPropertiesOrCapabilitiesChanged();
}
}

1
Vcn/tests/unit/java/com/android/server/vcn/routeselection/NetworkEvaluationTestBase.java
View file

@ -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);