diff options
| author | xshu <xshu@google.com> | 2020-03-16 16:29:11 -0700 |
|---|---|---|
| committer | xshu <xshu@google.com> | 2020-03-16 16:29:11 -0700 |
| commit | f45c51282d4205e20d91b3d359d6c4bea805c5c9 (patch) | |
| tree | 5fe9cd7d92255ba559e21db49ba62d38943bae22 | |
| parent | 544e531dc8534bbf197c2abe58748c897a0f5a75 (diff) | |
Stop supplicant auto-connect during pno scan
Bug: 135503681
Test: atest com.android.server.wifi
Change-Id: Ib6ee4a088ab35fa315b923550fef882b4414bf83
| -rw-r--r-- | service/java/com/android/server/wifi/WifiNative.java | 1 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java index fa76bae50..2a43a3474 100644 --- a/service/java/com/android/server/wifi/WifiNative.java +++ b/service/java/com/android/server/wifi/WifiNative.java @@ -1582,6 +1582,7 @@ public class WifiNative { * @return true on success. */ public boolean startPnoScan(@NonNull String ifaceName, PnoSettings pnoSettings) { + removeAllNetworks(ifaceName); return mWifiCondManager.startPnoScan(ifaceName, pnoSettings.toNativePnoSettings(), Runnable::run, new WifiNl80211Manager.PnoScanRequestCallback() { diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java index ae8f1229e..3d4f33a35 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java @@ -757,6 +757,7 @@ public class WifiNativeTest extends WifiBaseTest { verify(mWificondControl).startPnoScan(eq(WIFI_IFACE_NAME), eq(TEST_PNO_SETTINGS.toNativePnoSettings()), any(), captor.capture()); captor.getValue().onPnoRequestSucceeded(); + verify(mStaIfaceHal).removeAllNetworks(WIFI_IFACE_NAME); verify(mWifiMetrics).incrementPnoScanStartAttemptCount(); } |