From aa3971b14ca3fc78129e9f969889e86e45fc4b63 Mon Sep 17 00:00:00 2001
From: Yan Yan <evitayan@google.com>
Date: Thu, 10 Oct 2024 11:53:55 -0700
Subject: [PATCH] Clean up FLAG_EVALUATE_IPSEC_LOSS_ON_LP_NC_CHANGE

Bug: 323238888
Test: atest FrameworksVcnTests && atest CtsVcnTestCases
Flag: EXEMPT flag cleanup
Change-Id: I18a6c5b32806b6cd20bfa6b5b475d220be975a7c
---
 Vcn/flags/flags.aconfig                             |  7 -------
 .../routeselection/UnderlyingNetworkEvaluator.java  | 13 ++++---------
 .../routeselection/NetworkEvaluationTestBase.java   |  1 -
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/Vcn/flags/flags.aconfig b/Vcn/flags/flags.aconfig
index 15d671dde0..614c7634af 100644
--- a/Vcn/flags/flags.aconfig
+++ b/Vcn/flags/flags.aconfig
@@ -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"
 }
\ No newline at end of file
diff --git a/Vcn/service-b/src/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluator.java b/Vcn/service-b/src/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluator.java
index 78e06d46c7..c852fb4e17 100644
--- a/Vcn/service-b/src/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluator.java
+++ b/Vcn/service-b/src/com/android/server/vcn/routeselection/UnderlyingNetworkEvaluator.java
@@ -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();
         }
     }
 
diff --git a/Vcn/tests/unit/java/com/android/server/vcn/routeselection/NetworkEvaluationTestBase.java b/Vcn/tests/unit/java/com/android/server/vcn/routeselection/NetworkEvaluationTestBase.java
index 97617f9abc..2320dfc224 100644
--- a/Vcn/tests/unit/java/com/android/server/vcn/routeselection/NetworkEvaluationTestBase.java
+++ b/Vcn/tests/unit/java/com/android/server/vcn/routeselection/NetworkEvaluationTestBase.java
@@ -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);