Remove the feature flag check for the

delayed carrier scan optimization.

We will use the overlay to control
whether the feature is available. By default,
this will not be enabled for any carriers.

Bug: 329142362
Flag: com.android.wifi.flags.delayed_carrier_network_selection
Test: atest WifiConnectivityManagerTest
Change-Id: I04e70fe8089c40d88f5e8e0d4ccbc6925d986520

3 files changed, 6 insertions, 6 deletions

diff --git a/service/ServiceWifiResources/res/values/config.xml b/service/ServiceWifiResources/res/values/config.xml
index 7a25230c1a..2b3b9f9ab8 100644
--- a/service/ServiceWifiResources/res/values/config.xml
+++ b/service/ServiceWifiResources/res/values/config.xml
@@ -1364,7 +1364,10 @@
          feature are included in the array by default.
      -->
     <integer-array translatable="false" name="config_wifiDelayedSelectionCarrierIds">
-        <item>2032</item>
+        <!-- Below is a sample configuration for this list:
+        <item>1234</item>
+        <item>5678</item>
+        -->
     </integer-array>
 
     <!-- Delay time in milliseconds for delayed carrier network selection.
diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java
index e792a9f04f..ce05d26158 100644
--- a/service/java/com/android/server/wifi/WifiConnectivityManager.java
+++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java
@@ -688,10 +688,8 @@ public class WifiConnectivityManager {
                 mRestrictedConnectionAllowedUids, skipSufficiencyCheck,
                 mAutojoinRestrictionSecurityTypes);
         // Filter candidates before caching to avoid reconnecting on failure
-        if (mFeatureFlags.delayedCarrierNetworkSelection()) {
-            candidates = filterDelayedCarrierSelectionCandidates(candidates, listenerName,
-                    isFullScan);
-        }
+        candidates = filterDelayedCarrierSelectionCandidates(candidates, listenerName,
+                isFullScan);
         mLatestCandidates = candidates;
         mLatestCandidatesTimestampMs = mClock.getElapsedSinceBootMillis();
 
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java
index 04896fc814..93b57e33eb 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java
@@ -181,7 +181,6 @@ public class WifiConnectivityManagerTest extends WifiBaseTest {
         when(mPrimaryClientModeManager.getConnectionInfo()).thenReturn(mWifiInfo);
         when(mActiveModeWarden.getPrimaryClientModeManager()).thenReturn(mPrimaryClientModeManager);
         when(mDeviceConfigFacade.getFeatureFlags()).thenReturn(mFeatureFlags);
-        when(mFeatureFlags.delayedCarrierNetworkSelection()).thenReturn(true);
         when(mWifiCarrierInfoManager.isCarrierNetworkOffloadEnabled(anyInt(), anyBoolean()))
                 .thenReturn(true);
         doAnswer(new AnswerWithArguments() {