From a1727e40dc6b2742df5b32451f1dfa787fc6aa98 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Tue, 14 Mar 2017 08:54:56 -0700 Subject: WifiStateMachine: Note user selection only for settings app The previous CL for this bug also modified the user selection when we let non-settings app to initiate connection. This bug CL reverts that, non-settings app can only initiate connection, but not set user connect choice. Bug: 36040264 Test: Unit tests Change-Id: If70fe974274277bd804f5cc17a5751dee76f44e3 --- tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java index f77db43a4..c9bc3d657 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java @@ -811,6 +811,8 @@ public class WifiStateMachineTest { @Test public void connect() throws Exception { addNetworkAndVerifySuccess(); + when(mWifiConfigManager.enableNetwork(eq(0), eq(true), anyInt())).thenReturn(true); + when(mWifiConfigManager.checkAndUpdateLastConnectUid(eq(0), anyInt())).thenReturn(true); mWsm.setOperationalMode(WifiStateMachine.CONNECT_MODE); mLooper.dispatchAll(); @@ -820,6 +822,7 @@ public class WifiStateMachineTest { mLooper.stopAutoDispatch(); verify(mWifiConfigManager).enableNetwork(eq(0), eq(true), anyInt()); + verify(mWifiConnectivityManager).setUserConnectChoice(eq(0)); mWsm.sendMessage(WifiMonitor.NETWORK_CONNECTION_EVENT, 0, 0, sBSSID); mLooper.dispatchAll(); @@ -856,6 +859,7 @@ public class WifiStateMachineTest { mLooper.stopAutoDispatch(); verify(mWifiConfigManager).enableNetwork(eq(0), eq(true), anyInt()); + verify(mWifiConnectivityManager, never()).setUserConnectChoice(eq(0)); mWsm.sendMessage(WifiMonitor.NETWORK_CONNECTION_EVENT, 0, 0, sBSSID); mLooper.dispatchAll(); -- cgit v1.2.3