Merge "PasspointNetworkEvaluator: Ignore networks disconnected by user." into qt-dev

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java
index a396d4d93..6cbd84864 100644
--- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java
@@ -636,4 +636,29 @@ public class PasspointNetworkEvaluatorTest {
                 anyInt());
         verify(mOnConnectableListener, never()).onConnectable(any(), any(), anyInt());
     }
+
+    /**
+     * Verify that when a network matching a home provider is found, but the network was
+     * disconnected previously by user, it returns {@code null} for candidate.
+     */
+    @Test
+    public void evaluateScanResultWithHomeMatchButPreviouslyUserDisconnected() {
+        List<ScanDetail> scanDetails = Arrays.asList(new ScanDetail[]{
+                generateScanDetail(TEST_SSID1, TEST_BSSID1)});
+
+        // Setup matching providers for ScanDetail with TEST_SSID1.
+        Pair<PasspointProvider, PasspointMatch> homeProvider = Pair.create(
+                TEST_PROVIDER1, PasspointMatch.HomeProvider);
+
+        // Return homeProvider for the first ScanDetail (TEST_SSID1).
+        when(mPasspointManager.matchProvider(any(ScanResult.class))).thenReturn(homeProvider);
+        when(mWifiConfigManager.addOrUpdateNetwork(any(WifiConfiguration.class), anyInt()))
+                .thenReturn(new NetworkUpdateResult(TEST_NETWORK_ID));
+        when(mWifiConfigManager.getConfiguredNetwork(TEST_NETWORK_ID)).thenReturn(TEST_CONFIG1);
+        when(mWifiConfigManager.wasEphemeralNetworkDeleted("\"" + TEST_SSID1 + "\""))
+                .thenReturn(true);
+        assertEquals(null, mEvaluator.evaluateNetworks(
+                scanDetails, null, null, false, false, mOnConnectableListener));
+        verify(mOnConnectableListener, never()).onConnectable(any(), any(), anyInt());
+    }
 }