diff options
| author | Nate Jiang <qiangjiang@google.com> | 2020-03-30 16:59:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-30 16:59:03 +0000 |
| commit | efd9c0c53135988db2e0a25f9525b4f1f46eacb2 (patch) | |
| tree | 8fd4c0bfbb4783d3d0ce538ce58a025841f708d6 | |
| parent | 51f7cd7a8fabc8d07aadf2e079bc26c0524bfe7f (diff) | |
| parent | ddfe2d6361f28c3ef44844aae23237876c46a4fd (diff) | |
Merge "When ClientMode stop, clean the user temporarily disabled network list" into rvc-dev
3 files changed, 3 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index 0e8be4107..270af89d1 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -3582,6 +3582,7 @@ public class ClientModeImpl extends StateMachine { // Let's remove any ephemeral or passpoint networks. mWifiConfigManager.removeAllEphemeralOrPasspointConfiguredNetworks(); + mWifiConfigManager.clearUserTemporarilyDisabledList(); } void registerConnected() { diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 6f7fe26c5..4e4f51d60 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -2861,9 +2861,8 @@ public class WifiConfigManager { } /** - * Clear all deleted ephemeral networks. + * Clear all user temporarily disabled networks. */ - @VisibleForTesting public void clearUserTemporarilyDisabledList() { mUserTemporarilyDisabledList.clear(); } diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java index 60284978b..d912020e9 100644 --- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java @@ -3324,6 +3324,7 @@ public class ClientModeImplTest extends WifiBaseTest { mLooper.dispatchAll(); verify(mIpClient).shutdown(); verify(mWifiConfigManager).removeAllEphemeralOrPasspointConfiguredNetworks(); + verify(mWifiConfigManager).clearUserTemporarilyDisabledList(); } /** |