From a442338fbb51bc797ab03eca48d3b0bc0c454e2e Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 29 May 2020 15:47:43 -0700 Subject: ClientModeImpl: Ignore connect when connecting to network Use internal variables to check whether we're connected or connecting to the network requested in WifiManager.connect(). If there is a credential change, we will forcefully retrigger a new connection request. Bug: 157696785 Test: atest com.android.server.wifi Change-Id: I514b5b3a1ed5205fde98bc6fd2b59285e10913ef Merged-In: I514b5b3a1ed5205fde98bc6fd2b59285e10913ef --- .../android/server/wifi/ClientModeImplTest.java | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java index 1761b2113..b53b648cf 100644 --- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java @@ -1534,6 +1534,60 @@ public class ClientModeImplTest extends WifiBaseTest { verify(mWifiNative, times(1)).connectToNetwork(eq(WIFI_IFACE_NAME), any()); } + /** + * If caller tries to connect to a network that is already connecting, the connection request + * should succeed. + * + * Test: Create and trigger connect to a network, then try to reconnect to the same network. + * Verify that connection request returns with CONNECT_NETWORK_SUCCEEDED and did not trigger a + * new connection. + */ + @Test + public void reconnectToConnectingNetwork() throws Exception { + triggerConnect(); + + // try to reconnect to the same network (before connection is established). + IActionListener connectActionListener = mock(IActionListener.class); + mCmi.connect(null, FRAMEWORK_NETWORK_ID, mock(Binder.class), connectActionListener, 0, + Binder.getCallingUid()); + mLooper.dispatchAll(); + verify(connectActionListener).onSuccess(); + + // Verify that we didn't trigger a second connection. + verify(mWifiNative, times(1)).connectToNetwork(eq(WIFI_IFACE_NAME), any()); + } + + /** + * If caller tries to connect to a network that is already connecting, the connection request + * should succeed. + * + * Test: Create and trigger connect to a network, then try to reconnect to the same network. + * Verify that connection request returns with CONNECT_NETWORK_SUCCEEDED and did trigger a new + * connection. + */ + @Test + public void reconnectToConnectingNetworkWithCredentialChange() throws Exception { + triggerConnect(); + + // try to reconnect to the same network with a credential changed (before connection is + // established). + WifiConfiguration config = new WifiConfiguration(); + config.networkId = FRAMEWORK_NETWORK_ID; + NetworkUpdateResult networkUpdateResult = + new NetworkUpdateResult(false /* ip */, false /* proxy */, true /* credential */); + networkUpdateResult.setNetworkId(FRAMEWORK_NETWORK_ID); + when(mWifiConfigManager.addOrUpdateNetwork(eq(config), anyInt())) + .thenReturn(networkUpdateResult); + IActionListener connectActionListener = mock(IActionListener.class); + mCmi.connect(config, WifiConfiguration.INVALID_NETWORK_ID, mock(Binder.class), + connectActionListener, 0, Binder.getCallingUid()); + mLooper.dispatchAll(); + verify(connectActionListener).onSuccess(); + + // Verify that we triggered a second connection. + verify(mWifiNative, times(2)).connectToNetwork(eq(WIFI_IFACE_NAME), any()); + } + /** * If caller tries to connect to a new network while still provisioning the current one, * the connection attempt should succeed. -- cgit v1.2.3