From e836930a4d699b7044cef273290f63c7cd949045 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 5 Feb 2020 09:12:17 -0800 Subject: WCM: Allow forceConnectivityScan when autojoin disabled Bug: 141889280 Test: atest com.android.server.wifi Change-Id: I1333bbbe871653debdd918ebc8858afe46d13d3f --- .../server/wifi/WifiConnectivityManagerTest.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java index 0ec4849eb..1678d67a8 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java @@ -2302,4 +2302,25 @@ public class WifiConnectivityManagerTest extends WifiBaseTest { mWifiConnectivityManager.setBluetoothConnected(false); verify(mWifiNS).setBluetoothConnected(false); } + + /** + * Verify that WifiChannelUtilization is updated + */ + @Test + public void verifyForceConnectivityScan() { + // Auto-join enabled + mWifiConnectivityManager.setAutoJoinEnabledExternal(true); + mWifiConnectivityManager.forceConnectivityScan(WIFI_WORK_SOURCE); + verify(mWifiScanner).startScan(any(), any(), any(), any()); + + // Auto-join disabled + mWifiConnectivityManager.setAutoJoinEnabledExternal(false); + mWifiConnectivityManager.forceConnectivityScan(WIFI_WORK_SOURCE); + verify(mWifiScanner, times(2)).startScan(any(), any(), any(), any()); + + // Wifi disabled, no new scans + mWifiConnectivityManager.setWifiEnabled(false); + mWifiConnectivityManager.forceConnectivityScan(WIFI_WORK_SOURCE); + verify(mWifiScanner, times(2)).startScan(any(), any(), any(), any()); + } } -- cgit v1.2.3