Do not use ANQP when Wifi is connecting or connected

Sending ANQP request when wifi is connecting or connected
may fail the connection.
This CL fixes it by adding a parameter to WifiConfigManager
::updateSavedNetworkWithNewScanDetail(). This boolean value
can indicate that we are connecting or connected.
Link debouncing is also considered as connecting in this case.

BUG=26494190
TEST=runtest frameworks-wifi
Change-Id: Ic4dfd0c0ba0392da68b6705d18fb82d92f44e508

1 files changed, 18 insertions, 18 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectorTest.java b/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectorTest.java
index 4e41fa82b..1d8ec43cb 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectorTest.java
@@ -251,22 +251,22 @@ public class WifiQualifiedNetworkSelectorTest {
                 ScanDetail scanDetail = scanDetails.get(i);
                 List<WifiConfiguration> associateWithScanResult = new ArrayList<>();
                 associateWithScanResult.add(configs[i]);
-                when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(scanDetail))
-                        .thenReturn(associateWithScanResult);
+                when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(eq(scanDetail),
+                        anyBoolean())).thenReturn(associateWithScanResult);
             }
         } else {
             for (int i = 0; i < configs.length; i++) {
                 ScanDetail scanDetail = scanDetails.get(i);
                 List<WifiConfiguration> associateWithScanResult = new ArrayList<>();
                 associateWithScanResult.add(configs[i]);
-                when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(scanDetail))
-                        .thenReturn(associateWithScanResult);
+                when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(eq(scanDetail),
+                        anyBoolean())).thenReturn(associateWithScanResult);
             }
 
             // associated the remaining scan details with a NULL config.
             for (int i = configs.length; i < scanDetails.size(); i++) {
-                when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(scanDetails.get(i)))
-                        .thenReturn(null);
+                when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(eq(scanDetails.get(i)),
+                        anyBoolean())).thenReturn(null);
             }
         }
     }
@@ -1646,8 +1646,8 @@ public class WifiQualifiedNetworkSelectorTest {
         configureScoreCache(scanDetails, scores, meteredHints);
 
         // No saved networks.
-        when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(any(ScanDetail.class)))
-                .thenReturn(null);
+        when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(any(ScanDetail.class),
+                anyBoolean())).thenReturn(null);
 
         WifiConfiguration unTrustedNetworkCandidate = mock(WifiConfiguration.class);
         // Setup the config as an invalid candidate. This is done to workaround a Mockito issue.
@@ -1732,10 +1732,10 @@ public class WifiQualifiedNetworkSelectorTest {
         scanResultLinkConfiguration(savedConfigs, savedScanDetails);
 
         //Force mock ConfigManager to return null (and not an empty list) for "test3" & "test4"
-        when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(scanDetails.get(2)))
-                    .thenReturn(null);
-        when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(scanDetails.get(3)))
-                    .thenReturn(null);
+        when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(eq(scanDetails.get(2)),
+                anyBoolean())).thenReturn(null);
+        when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(eq(scanDetails.get(3)),
+                anyBoolean())).thenReturn(null);
 
         ScanResult chosenScanResult = scanDetails.get(0).getScanResult();
 
@@ -1811,10 +1811,10 @@ public class WifiQualifiedNetworkSelectorTest {
         scanResultLinkConfiguration(savedConfigs, savedScanDetails);
 
         //Force mock ConfigManager to return null (and not an empty list) for "test3" & "test4"
-        when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(scanDetails.get(2)))
-                    .thenReturn(null);
-        when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(scanDetails.get(3)))
-                    .thenReturn(null);
+        when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(eq(scanDetails.get(2)),
+                anyBoolean())).thenReturn(null);
+        when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(eq(scanDetails.get(3)),
+                anyBoolean())).thenReturn(null);
 
         ScanResult chosenScanResult = scanDetails.get(0).getScanResult();
 
@@ -1860,8 +1860,8 @@ public class WifiQualifiedNetworkSelectorTest {
         configureScoreCache(scanDetails, scores, meteredHints);
 
         // No saved networks.
-        when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(any(ScanDetail.class)))
-                .thenReturn(null);
+        when(mWifiConfigManager.updateSavedNetworkWithNewScanDetail(any(ScanDetail.class),
+                anyBoolean())).thenReturn(null);
 
         WifiConfiguration unTrustedNetworkCandidate = mock(WifiConfiguration.class);
         // Setup the config as an invalid candidate. This is done to workaround a Mockito issue.