diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-10-05 03:12:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-05 03:12:29 +0000 |
| commit | 83e8a7ab59dc750f630bdd96a8e4773e4ca984ba (patch) | |
| tree | 156e534e706d48543177d6f246a54d516a113b82 /tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java | |
| parent | db68688e4eeeeceb9ab1b3bc422f77458fba2f24 (diff) | |
| parent | 470817b13e56d915805729ab4f51075f3fa2ec15 (diff) | |
| download | android_frameworks_opt_net_wifi-83e8a7ab59dc750f630bdd96a8e4773e4ca984ba.tar.gz android_frameworks_opt_net_wifi-83e8a7ab59dc750f630bdd96a8e4773e4ca984ba.tar.bz2 android_frameworks_opt_net_wifi-83e8a7ab59dc750f630bdd96a8e4773e4ca984ba.zip | |
Merge "Blame scan request from WifiManager.reconnect()" into oc-mr1-dev
Diffstat (limited to 'tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java index 5fb700720..4fabd9d1e 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java @@ -1178,7 +1178,7 @@ public class WifiConnectivityManagerTest { // Force a connectivity scan which enables WifiConnectivityManager // to wait for full band scan results. - mWifiConnectivityManager.forceConnectivityScan(); + mWifiConnectivityManager.forceConnectivityScan(WIFI_WORK_SOURCE); // No roaming because no full band scan results. verify(mWifiStateMachine, times(0)).startConnectToNetwork( @@ -1189,7 +1189,7 @@ public class WifiConnectivityManagerTest { // Force a connectivity scan which enables WifiConnectivityManager // to wait for full band scan results. - mWifiConnectivityManager.forceConnectivityScan(); + mWifiConnectivityManager.forceConnectivityScan(WIFI_WORK_SOURCE); // Roaming attempt because full band scan results are available. verify(mWifiStateMachine).startConnectToNetwork( @@ -1286,14 +1286,14 @@ public class WifiConnectivityManagerTest { // its blacklist expiration time hasn't reached yet. when(mClock.getElapsedSinceBootMillis()).thenReturn(SystemClock.elapsedRealtime() + WifiConnectivityManager.BSSID_BLACKLIST_EXPIRE_TIME_MS / 2); - mWifiConnectivityManager.forceConnectivityScan(); + mWifiConnectivityManager.forceConnectivityScan(WIFI_WORK_SOURCE); assertTrue(mWifiConnectivityManager.isBssidDisabled(bssid)); // Force another connectivity scan at BSSID_BLACKLIST_EXPIRE_TIME_MS from when the // BSSID was blacklisted. Verify that the blacklisted BSSId is freed. when(mClock.getElapsedSinceBootMillis()).thenReturn(SystemClock.elapsedRealtime() + WifiConnectivityManager.BSSID_BLACKLIST_EXPIRE_TIME_MS); - mWifiConnectivityManager.forceConnectivityScan(); + mWifiConnectivityManager.forceConnectivityScan(WIFI_WORK_SOURCE); // Verify the BSSID is no longer blacklisted. assertFalse(mWifiConnectivityManager.isBssidDisabled(bssid)); |