diff options
| author | Randy Pan <zpan@google.com> | 2016-07-27 13:24:19 -0700 |
|---|---|---|
| committer | Christine Hallstrom <hallstrom@google.com> | 2016-08-04 22:22:58 +0000 |
| commit | 2efcaa62b92a20fed7c370a18b948ea1fcdd7e51 (patch) | |
| tree | 995c61b755d19d8f1a45b83228adfc629856d41c /tests | |
| parent | c2a5d4f9e80350923ad64cdb0818ec6d77578bfa (diff) | |
DO NOT MERGE ANYWHERE: Fix WiFiNetworkAgent#unwanted
1) No longer blacklist a network when it's unwanted by NetworkAgent.
2) Deprecate the network disable reason BAD_LINK.
3) Stop WiFi Auto_Connect attempt if neither saved Wifi network nor
untrusted WiFi network is requested.
Note: this CL is a cherry-pick of ag/1261693, as that CL cannot be
submitted until after N DR cutoff date (expect submission on 8/18).
Bug: 28558417
Tests: Unit Tests and manual tests
Change-Id: I2b245cfb357b92ed925d89603e0fefded9d6865a
(cherry pick from commit c4d044acc589188f25b8dcd962db52e1fc08fe8d)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java index 022997d67..b1f88ecc9 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java @@ -75,7 +75,7 @@ public class WifiConnectivityManagerTest { mWifiQNS = mockWifiQualifiedNetworkSelector(); mWifiConnectivityManager = new WifiConnectivityManager(mContext, mWifiStateMachine, mWifiScanner, mWifiConfigManager, mWifiInfo, mWifiQNS, mWifiInjector, - mLooper.getLooper()); + mLooper.getLooper(), true); mWifiConnectivityManager.setWifiEnabled(true); when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime()); } |