SoftApManager: move interface creation
Move softap interface creation from WifiStateMachine to SoftApManager.
This allows SoftApManager to take full control of the mode and report
errors when attempting to initialize components for the mode.
Bug: 69888789
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: manual verification from Settings and QuickSettings
Test: wifi integration tests
Test: wifi CTS tests
Change-Id: Ib6526debdb9b5f376c064b54ca07c3559ffc0d92
diff --git a/service/java/com/android/server/wifi/SoftApManager.java b/service/java/com/android/server/wifi/SoftApManager.java
index 2200618..0abde24 100644
--- a/service/java/com/android/server/wifi/SoftApManager.java
+++ b/service/java/com/android/server/wifi/SoftApManager.java
@@ -38,6 +38,7 @@
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
+import android.util.Pair;
import com.android.internal.R;
import com.android.internal.annotations.VisibleForTesting;
@@ -74,8 +75,8 @@
private final Listener mListener;
- private final IApInterface mApInterface;
- private final String mApInterfaceName;
+ private IApInterface mApInterface;
+ private String mApInterfaceName;
private final INetworkManagementService mNwService;
private final WifiApConfigStore mWifiApConfigStore;
@@ -114,8 +115,6 @@
WifiNative wifiNative,
String countryCode,
Listener listener,
- @NonNull IApInterface apInterface,
- @NonNull String ifaceName,
INetworkManagementService nms,
WifiApConfigStore wifiApConfigStore,
@NonNull SoftApModeConfiguration apConfig,
@@ -125,8 +124,6 @@
mWifiNative = wifiNative;
mCountryCode = countryCode;
mListener = listener;
- mApInterface = apInterface;
- mApInterfaceName = ifaceName;
mNwService = nms;
mWifiApConfigStore = wifiApConfigStore;
mMode = apConfig.getTargetMode();
@@ -181,6 +178,17 @@
}
/**
+ * Helper function to increment the appropriate setup failure metrics.
+ */
+ private void incrementMetricsForSetupFailure(int failureReason) {
+ if (failureReason == WifiNative.SETUP_FAILURE_HAL) {
+ mWifiMetrics.incrementNumWifiOnFailureDueToHal();
+ } else if (failureReason == WifiNative.SETUP_FAILURE_WIFICOND) {
+ mWifiMetrics.incrementNumWifiOnFailureDueToWificond();
+ }
+ }
+
+ /**
* Start a soft AP instance with the given configuration.
* @param config AP configuration
* @return integer result code
@@ -293,6 +301,36 @@
public boolean processMessage(Message message) {
switch (message.what) {
case CMD_START:
+ // need to create our interface
+ mApInterface = null;
+ Pair<Integer, IApInterface> statusAndInterface =
+ mWifiNative.setupForSoftApMode(mWifiNative.getInterfaceName());
+ if (statusAndInterface.first == WifiNative.SETUP_SUCCESS) {
+ mApInterface = statusAndInterface.second;
+ } else {
+ incrementMetricsForSetupFailure(statusAndInterface.first);
+ }
+ if (mApInterface == null) {
+ updateApState(WifiManager.WIFI_AP_STATE_FAILED,
+ WifiManager.WIFI_AP_STATE_DISABLED,
+ WifiManager.SAP_START_FAILURE_GENERAL);
+ mWifiMetrics.incrementSoftApStartResult(
+ false, WifiManager.SAP_START_FAILURE_GENERAL);
+ break;
+ }
+ try {
+ mApInterfaceName = mApInterface.getInterfaceName();
+ } catch (RemoteException e) {
+ // Failed to get the interface name. This is not a good sign and we
+ // should report a failure.
+ updateApState(WifiManager.WIFI_AP_STATE_FAILED,
+ WifiManager.WIFI_AP_STATE_DISABLED,
+ WifiManager.SAP_START_FAILURE_GENERAL);
+ mWifiMetrics.incrementSoftApStartResult(
+ false, WifiManager.SAP_START_FAILURE_GENERAL);
+ break;
+ }
+
// first a sanity check on the interface name. If we failed to retrieve it,
// we are going to have a hard time setting up routing.
if (TextUtils.isEmpty(mApInterfaceName)) {
diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java
index 72c72e0..9c9622c 100644
--- a/service/java/com/android/server/wifi/WifiInjector.java
+++ b/service/java/com/android/server/wifi/WifiInjector.java
@@ -21,7 +21,6 @@
import android.content.Context;
import android.net.NetworkKey;
import android.net.NetworkScoreManager;
-import android.net.wifi.IApInterface;
import android.net.wifi.IWifiScanner;
import android.net.wifi.IWificond;
import android.net.wifi.WifiInfo;
@@ -382,19 +381,15 @@
* @param nmService NetworkManagementService allowing SoftApManager to listen for interface
* changes
* @param listener listener for SoftApManager
- * @param apInterface network interface to start hostapd against
- * @param ifaceName name of the ap interface
* @param config SoftApModeConfiguration object holding the config and mode
* @return an instance of SoftApManager
*/
public SoftApManager makeSoftApManager(INetworkManagementService nmService,
SoftApManager.Listener listener,
- @NonNull IApInterface apInterface,
- @NonNull String ifaceName,
@NonNull SoftApModeConfiguration config) {
return new SoftApManager(mContext, mWifiStateMachineHandlerThread.getLooper(),
- mFrameworkFacade, mWifiNative, mCountryCode.getCountryCode(), listener, apInterface,
- ifaceName, nmService, mWifiApConfigStore, config, mWifiMetrics);
+ mFrameworkFacade, mWifiNative, mCountryCode.getCountryCode(), listener,
+ nmService, mWifiApConfigStore, config, mWifiMetrics);
}
/**
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index e5014dc..95caf29 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -57,7 +57,6 @@
import android.net.TrafficStats;
import android.net.dhcp.DhcpClient;
import android.net.ip.IpClient;
-import android.net.wifi.IApInterface;
import android.net.wifi.IClientInterface;
import android.net.wifi.RssiPacketCountInfo;
import android.net.wifi.ScanResult;
@@ -6967,7 +6966,7 @@
}
SoftApModeConfiguration config = (SoftApModeConfiguration) message.obj;
mMode = config.getTargetMode();
-
+ /*
IApInterface apInterface = null;
Pair<Integer, IApInterface> statusAndInterface =
mWifiNative.setupForSoftApMode(mInterfaceName);
@@ -6994,12 +6993,10 @@
transitionTo(mInitialState);
return;
}
-
+ */
checkAndSetConnectivityInstance();
mSoftApManager = mWifiInjector.makeSoftApManager(mNwService,
new SoftApListener(),
- apInterface,
- mIfaceName,
config);
mSoftApManager.start();
mWifiStateTracker.updateState(WifiStateTracker.SOFT_AP);
diff --git a/service/java/com/android/server/wifi/WifiStateMachinePrime.java b/service/java/com/android/server/wifi/WifiStateMachinePrime.java
index de970ee..35cb7e5 100644
--- a/service/java/com/android/server/wifi/WifiStateMachinePrime.java
+++ b/service/java/com/android/server/wifi/WifiStateMachinePrime.java
@@ -17,15 +17,12 @@
package com.android.server.wifi;
import android.annotation.NonNull;
-import android.net.wifi.IApInterface;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.os.INetworkManagementService;
import android.os.Looper;
import android.os.Message;
-import android.os.RemoteException;
import android.util.Log;
-import android.util.Pair;
import com.android.internal.util.Protocol;
import com.android.internal.util.State;
@@ -252,8 +249,6 @@
}
class SoftAPModeState extends State {
- IApInterface mApInterface = null;
- String mIfaceName = null;
@Override
public void enter() {
@@ -263,32 +258,6 @@
return;
}
- // Continue with setup since we are changing modes
- mApInterface = null;
-
- Pair<Integer, IApInterface> statusAndInterface =
- mWifiNative.setupForSoftApMode(mInterfaceName);
- if (statusAndInterface.first == WifiNative.SETUP_SUCCESS) {
- mApInterface = statusAndInterface.second;
- } else {
- // TODO: incorporate metrics - or this particular one will be done in WifiNative
- //incrementMetricsForSetupFailure(statusAndInterface.first);
- }
- if (mApInterface == null) {
- // TODO: update battery stats that a failure occured - best to do in
- // initialization Failed. Keeping line copied from WSM for a reference
- //setWifiApState(WIFI_AP_STATE_FAILED,
- // WifiManager.SAP_START_FAILURE_GENERAL, null, mMode);
- initializationFailed("Could not get IApInterface instance");
- return;
- }
-
- try {
- mIfaceName = mApInterface.getInterfaceName();
- } catch (RemoteException e) {
- initializationFailed("Could not get IApInterface name");
- return;
- }
mModeStateMachine.transitionTo(mSoftAPModeActiveState);
}
@@ -306,8 +275,6 @@
// not in active state, nothing to stop.
break;
case CMD_START_AP_FAILURE:
- // remove the saved config for the start attempt
- mApConfigQueue.poll();
Log.e(TAG, "Failed to start SoftApMode. Wait for next mode command.");
break;
case CMD_AP_STOPPED:
@@ -324,14 +291,6 @@
cleanup();
}
- protected IApInterface getInterface() {
- return mApInterface;
- }
-
- protected String getInterfaceName() {
- return mIfaceName;
- }
-
private void initializationFailed(String message) {
Log.e(TAG, message);
mModeStateMachine.sendMessage(CMD_START_AP_FAILURE);
@@ -411,8 +370,7 @@
config = null;
}
this.mActiveModeManager = mWifiInjector.makeSoftApManager(mNMService,
- new SoftApListener(), ((SoftAPModeState) mSoftAPModeState).getInterface(),
- ((SoftAPModeState) mSoftAPModeState).getInterfaceName(), softApModeConfig);
+ new SoftApListener(), softApModeConfig);
mActiveModeManager.start();
}
diff --git a/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java b/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java
index 0c35904..4247e24 100644
--- a/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java
@@ -44,10 +44,12 @@
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.os.INetworkManagementService;
+import android.os.RemoteException;
import android.os.UserHandle;
import android.os.test.TestLooper;
import android.provider.Settings;
import android.test.suitebuilder.annotation.SmallTest;
+import android.util.Pair;
import com.android.internal.R;
import com.android.internal.util.WakeupMessage;
@@ -143,8 +145,6 @@
mWifiNative,
TEST_COUNTRY_CODE,
mListener,
- mApInterface,
- TEST_INTERFACE_NAME,
mNmService,
mWifiApConfigStore,
config,
@@ -206,6 +206,13 @@
/** Tests softap startup if default config fails to load. **/
@Test
public void startSoftApDefaultConfigFailedToLoad() throws Exception {
+ when(mWifiNative.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mApInterface.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mWifiNative.setupForSoftApMode(eq(TEST_INTERFACE_NAME)))
+ .thenReturn(Pair.create(WifiNative.SETUP_SUCCESS, mApInterface));
+
+ when(mApInterface.startHostapd(any())).thenReturn(true);
+ when(mApInterface.stopHostapd()).thenReturn(true);
when(mWifiApConfigStore.getApConfiguration()).thenReturn(null);
SoftApModeConfiguration nullApConfig =
new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, null);
@@ -215,8 +222,6 @@
mWifiNative,
TEST_COUNTRY_CODE,
mListener,
- mApInterface,
- TEST_INTERFACE_NAME,
mNmService,
mWifiApConfigStore,
nullApConfig,
@@ -240,6 +245,324 @@
}
/**
+ * Test that failure to create the SoftApInterface increments the corresponding metrics and
+ * proper state updates are sent out.
+ */
+ @Test
+ public void testSetupForSoftApModeHalFailureIncrementsMetrics() throws Exception {
+ when(mWifiNative.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mWifiNative.setupForSoftApMode(TEST_INTERFACE_NAME))
+ .thenReturn(Pair.create(WifiNative.SETUP_FAILURE_HAL, null));
+
+ SoftApModeConfiguration config = new SoftApModeConfiguration(
+ WifiManager.IFACE_IP_MODE_TETHERED, new WifiConfiguration());
+
+ when(mWifiApConfigStore.getApConfiguration()).thenReturn(null);
+ SoftApModeConfiguration nullApConfig =
+ new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, null);
+ SoftApManager newSoftApManager = new SoftApManager(mContext,
+ mLooper.getLooper(),
+ mFrameworkFacade,
+ mWifiNative,
+ TEST_COUNTRY_CODE,
+ mListener,
+ mNmService,
+ mWifiApConfigStore,
+ nullApConfig,
+ mWifiMetrics);
+ mLooper.dispatchAll();
+ newSoftApManager.start();
+ mLooper.dispatchAll();
+ verify(mListener).onStateChanged(WifiManager.WIFI_AP_STATE_FAILED,
+ WifiManager.SAP_START_FAILURE_GENERAL);
+ ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+ verify(mContext).sendStickyBroadcastAsUser(intentCaptor.capture(),
+ eq(UserHandle.ALL));
+
+ checkApStateChangedBroadcast(intentCaptor.getValue(), WIFI_AP_STATE_FAILED,
+ WIFI_AP_STATE_DISABLED, WifiManager.SAP_START_FAILURE_GENERAL, null,
+ nullApConfig.getTargetMode());
+
+ verify(mWifiMetrics).incrementNumWifiOnFailureDueToHal();
+ }
+
+ /**
+ * Test that failure to create the SoftApInterface due to a wificond error increments
+ * the corresponding metrics and proper state updates are sent out.
+ */
+ @Test
+ public void testSetupForSoftApModeWificondFailureIncrementsMetrics() throws Exception {
+ when(mWifiNative.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mWifiNative.setupForSoftApMode(TEST_INTERFACE_NAME))
+ .thenReturn(Pair.create(WifiNative.SETUP_FAILURE_WIFICOND, null));
+
+ SoftApModeConfiguration config = new SoftApModeConfiguration(
+ WifiManager.IFACE_IP_MODE_TETHERED, new WifiConfiguration());
+
+ when(mWifiApConfigStore.getApConfiguration()).thenReturn(null);
+ SoftApModeConfiguration nullApConfig =
+ new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, null);
+ SoftApManager newSoftApManager = new SoftApManager(mContext,
+ mLooper.getLooper(),
+ mFrameworkFacade,
+ mWifiNative,
+ TEST_COUNTRY_CODE,
+ mListener,
+ mNmService,
+ mWifiApConfigStore,
+ nullApConfig,
+ mWifiMetrics);
+ mLooper.dispatchAll();
+ newSoftApManager.start();
+ mLooper.dispatchAll();
+ verify(mListener).onStateChanged(WifiManager.WIFI_AP_STATE_FAILED,
+ WifiManager.SAP_START_FAILURE_GENERAL);
+ ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+ verify(mContext).sendStickyBroadcastAsUser(intentCaptor.capture(),
+ eq(UserHandle.ALL));
+
+ checkApStateChangedBroadcast(intentCaptor.getValue(), WIFI_AP_STATE_FAILED,
+ WIFI_AP_STATE_DISABLED, WifiManager.SAP_START_FAILURE_GENERAL, null,
+ nullApConfig.getTargetMode());
+
+ verify(mWifiMetrics).incrementNumWifiOnFailureDueToWificond();
+ }
+
+ /**
+ * Test that failure to retrieve the SoftApInterface increments the corresponding metrics
+ * and proper state updates are sent out.
+ */
+ @Test
+ public void testSetupForSoftApModeNullApInterfaceFailureIncrementsMetrics() throws Exception {
+ when(mWifiNative.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mWifiNative.setupForSoftApMode(eq(TEST_INTERFACE_NAME)))
+ .thenReturn(Pair.create(WifiNative.SETUP_SUCCESS, null));
+
+ SoftApModeConfiguration config = new SoftApModeConfiguration(
+ WifiManager.IFACE_IP_MODE_TETHERED, new WifiConfiguration());
+
+ when(mWifiApConfigStore.getApConfiguration()).thenReturn(null);
+ SoftApModeConfiguration nullApConfig =
+ new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, null);
+ SoftApManager newSoftApManager = new SoftApManager(mContext,
+ mLooper.getLooper(),
+ mFrameworkFacade,
+ mWifiNative,
+ TEST_COUNTRY_CODE,
+ mListener,
+ mNmService,
+ mWifiApConfigStore,
+ nullApConfig,
+ mWifiMetrics);
+ mLooper.dispatchAll();
+ newSoftApManager.start();
+ mLooper.dispatchAll();
+ verify(mListener).onStateChanged(WifiManager.WIFI_AP_STATE_FAILED,
+ WifiManager.SAP_START_FAILURE_GENERAL);
+ ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+ verify(mContext).sendStickyBroadcastAsUser(intentCaptor.capture(),
+ eq(UserHandle.ALL));
+
+ checkApStateChangedBroadcast(intentCaptor.getValue(), WIFI_AP_STATE_FAILED,
+ WIFI_AP_STATE_DISABLED, WifiManager.SAP_START_FAILURE_GENERAL, null,
+ nullApConfig.getTargetMode());
+
+ verify(mWifiMetrics).incrementSoftApStartResult(false,
+ WifiManager.SAP_START_FAILURE_GENERAL);
+ }
+
+ /**
+ * Test that an empty SoftApInterface name is detected as a failure and increments the
+ * corresponding metrics and proper state updates are sent out.
+ */
+ @Test
+ public void testSetupForSoftApModeEmptyInterfaceNameFailureIncrementsMetrics()
+ throws Exception {
+ when(mWifiNative.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mApInterface.getInterfaceName()).thenReturn("");
+ when(mWifiNative.setupForSoftApMode(eq(TEST_INTERFACE_NAME)))
+ .thenReturn(Pair.create(WifiNative.SETUP_SUCCESS, mApInterface));
+
+ SoftApModeConfiguration config = new SoftApModeConfiguration(
+ WifiManager.IFACE_IP_MODE_TETHERED, new WifiConfiguration());
+
+ when(mWifiApConfigStore.getApConfiguration()).thenReturn(null);
+ SoftApModeConfiguration nullApConfig =
+ new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, null);
+ SoftApManager newSoftApManager = new SoftApManager(mContext,
+ mLooper.getLooper(),
+ mFrameworkFacade,
+ mWifiNative,
+ TEST_COUNTRY_CODE,
+ mListener,
+ mNmService,
+ mWifiApConfigStore,
+ nullApConfig,
+ mWifiMetrics);
+ mLooper.dispatchAll();
+ newSoftApManager.start();
+ mLooper.dispatchAll();
+ verify(mListener).onStateChanged(WifiManager.WIFI_AP_STATE_FAILED,
+ WifiManager.SAP_START_FAILURE_GENERAL);
+ ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+ verify(mContext).sendStickyBroadcastAsUser(intentCaptor.capture(),
+ eq(UserHandle.ALL));
+
+ checkApStateChangedBroadcast(intentCaptor.getValue(), WIFI_AP_STATE_FAILED,
+ WIFI_AP_STATE_DISABLED, WifiManager.SAP_START_FAILURE_GENERAL, "",
+ nullApConfig.getTargetMode());
+
+ verify(mWifiMetrics).incrementSoftApStartResult(false,
+ WifiManager.SAP_START_FAILURE_GENERAL);
+ }
+
+ /**
+ * Test that catching a RemoteException when retrieving the SoftApInterface name
+ * is detected as a failure and increments the corresponding metrics and proper
+ * state updates are sent out.
+ */
+ @Test
+ public void testSetupForSoftApModeInterfaceNameRemoteExceptionFailureIncrementsMetrics()
+ throws Exception {
+ when(mWifiNative.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ doThrow(new RemoteException()).when(mApInterface).getInterfaceName();
+ when(mWifiNative.setupForSoftApMode(eq(TEST_INTERFACE_NAME)))
+ .thenReturn(Pair.create(WifiNative.SETUP_SUCCESS, mApInterface));
+
+ SoftApModeConfiguration config = new SoftApModeConfiguration(
+ WifiManager.IFACE_IP_MODE_TETHERED, new WifiConfiguration());
+
+ when(mWifiApConfigStore.getApConfiguration()).thenReturn(null);
+ SoftApModeConfiguration nullApConfig =
+ new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, null);
+ SoftApManager newSoftApManager = new SoftApManager(mContext,
+ mLooper.getLooper(),
+ mFrameworkFacade,
+ mWifiNative,
+ TEST_COUNTRY_CODE,
+ mListener,
+ mNmService,
+ mWifiApConfigStore,
+ nullApConfig,
+ mWifiMetrics);
+ mLooper.dispatchAll();
+ newSoftApManager.start();
+ mLooper.dispatchAll();
+ verify(mListener).onStateChanged(WifiManager.WIFI_AP_STATE_FAILED,
+ WifiManager.SAP_START_FAILURE_GENERAL);
+ ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+ verify(mContext).sendStickyBroadcastAsUser(intentCaptor.capture(),
+ eq(UserHandle.ALL));
+
+ checkApStateChangedBroadcast(intentCaptor.getValue(), WIFI_AP_STATE_FAILED,
+ WIFI_AP_STATE_DISABLED, WifiManager.SAP_START_FAILURE_GENERAL, null,
+ nullApConfig.getTargetMode());
+
+ verify(mWifiMetrics).incrementSoftApStartResult(false,
+ WifiManager.SAP_START_FAILURE_GENERAL);
+ }
+
+
+ /**
+ * Tests that the generic error is propagated and properly reported when starting softap and we
+ * cannot register a wificond death handler.
+ */
+ @Test
+ public void startSoftApFailRegisterWificondDeathHandlerGeneralError() throws Exception {
+ WifiConfiguration config = new WifiConfiguration();
+ config.apBand = WifiConfiguration.AP_BAND_5GHZ;
+ config.SSID = TEST_SSID;
+ SoftApModeConfiguration softApConfig =
+ new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, config);
+
+ when(mWifiNative.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mApInterface.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mWifiNative.setupForSoftApMode(eq(TEST_INTERFACE_NAME)))
+ .thenReturn(Pair.create(WifiNative.SETUP_SUCCESS, mApInterface));
+
+ when(mWifiNative.registerWificondDeathHandler(any())).thenReturn(false);
+
+ SoftApManager newSoftApManager = new SoftApManager(mContext,
+ mLooper.getLooper(),
+ mFrameworkFacade,
+ mWifiNative,
+ null,
+ mListener,
+ mNmService,
+ mWifiApConfigStore,
+ softApConfig,
+ mWifiMetrics);
+ mLooper.dispatchAll();
+ newSoftApManager.start();
+ mLooper.dispatchAll();
+
+ ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+ verify(mContext, times(2)).sendStickyBroadcastAsUser(intentCaptor.capture(),
+ eq(UserHandle.ALL));
+
+ List<Intent> capturedIntents = intentCaptor.getAllValues();
+ checkApStateChangedBroadcast(capturedIntents.get(0), WIFI_AP_STATE_ENABLING,
+ WIFI_AP_STATE_DISABLED, HOTSPOT_NO_ERROR, TEST_INTERFACE_NAME,
+ softApConfig.getTargetMode());
+ checkApStateChangedBroadcast(capturedIntents.get(1), WIFI_AP_STATE_FAILED,
+ WIFI_AP_STATE_ENABLING, WifiManager.SAP_START_FAILURE_GENERAL, TEST_INTERFACE_NAME,
+ softApConfig.getTargetMode());
+ verify(mWifiMetrics).incrementSoftApStartResult(false,
+ WifiManager.SAP_START_FAILURE_GENERAL);
+ }
+
+ /**
+ * Tests that the generic error is propagated and properly reported when starting softap and we
+ * catch a RemoteException when attempting to register a NetworkObserver.
+ */
+ @Test
+ public void startSoftApFailNetworkObserverRemoteExceptionGeneralError() throws Exception {
+ WifiConfiguration config = new WifiConfiguration();
+ config.apBand = WifiConfiguration.AP_BAND_5GHZ;
+ config.SSID = TEST_SSID;
+ SoftApModeConfiguration softApConfig =
+ new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, config);
+
+ when(mWifiNative.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mApInterface.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mWifiNative.setupForSoftApMode(eq(TEST_INTERFACE_NAME)))
+ .thenReturn(Pair.create(WifiNative.SETUP_SUCCESS, mApInterface));
+
+ doThrow(new RemoteException()).when(mNmService).registerObserver(any());
+
+ SoftApManager newSoftApManager = new SoftApManager(mContext,
+ mLooper.getLooper(),
+ mFrameworkFacade,
+ mWifiNative,
+ null,
+ mListener,
+ mNmService,
+ mWifiApConfigStore,
+ softApConfig,
+ mWifiMetrics);
+ mLooper.dispatchAll();
+ newSoftApManager.start();
+ mLooper.dispatchAll();
+
+ ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+ verify(mContext, times(2)).sendStickyBroadcastAsUser(intentCaptor.capture(),
+ eq(UserHandle.ALL));
+
+ List<Intent> capturedIntents = intentCaptor.getAllValues();
+ checkApStateChangedBroadcast(capturedIntents.get(0), WIFI_AP_STATE_ENABLING,
+ WIFI_AP_STATE_DISABLED, HOTSPOT_NO_ERROR, TEST_INTERFACE_NAME,
+ softApConfig.getTargetMode());
+ checkApStateChangedBroadcast(capturedIntents.get(1), WIFI_AP_STATE_FAILED,
+ WIFI_AP_STATE_ENABLING, WifiManager.SAP_START_FAILURE_GENERAL, TEST_INTERFACE_NAME,
+ softApConfig.getTargetMode());
+ // we do once on enter of idle, and another after the failure
+ verify(mWifiNative, times(2)).deregisterWificondDeathHandler();
+ verify(mNmService).unregisterObserver(any());
+ verify(mWifiMetrics).incrementSoftApStartResult(false,
+ WifiManager.SAP_START_FAILURE_GENERAL);
+ }
+
+ /**
* Tests that the generic error is propagated and properly reported when starting softap and the
* specified channel cannot be used.
*/
@@ -251,6 +574,13 @@
SoftApModeConfiguration softApConfig =
new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, config);
+ when(mWifiNative.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mApInterface.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mWifiNative.setupForSoftApMode(eq(TEST_INTERFACE_NAME)))
+ .thenReturn(Pair.create(WifiNative.SETUP_SUCCESS, mApInterface));
+
+ when(mApInterface.startHostapd(any())).thenReturn(true);
+ when(mApInterface.stopHostapd()).thenReturn(true);
when(mWifiNative.isHalStarted()).thenReturn(true);
SoftApManager newSoftApManager = new SoftApManager(mContext,
@@ -259,8 +589,6 @@
mWifiNative,
null,
mListener,
- mApInterface,
- TEST_INTERFACE_NAME,
mNmService,
mWifiApConfigStore,
softApConfig,
@@ -297,14 +625,18 @@
when(mWifiNative.isHalStarted()).thenReturn(true);
+ when(mWifiNative.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mApInterface.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mWifiNative.setupForSoftApMode(eq(TEST_INTERFACE_NAME)))
+ .thenReturn(Pair.create(WifiNative.SETUP_SUCCESS, mApInterface));
+
+
SoftApManager newSoftApManager = new SoftApManager(mContext,
mLooper.getLooper(),
mFrameworkFacade,
mWifiNative,
TEST_COUNTRY_CODE,
mListener,
- mApInterface,
- TEST_INTERFACE_NAME,
mNmService,
mWifiApConfigStore,
softApConfig,
@@ -332,6 +664,10 @@
@Test
public void startSoftApApInterfaceFailedToStart() throws Exception {
when(mWifiNative.startSoftAp(any(), any())).thenReturn(false);
+ when(mWifiNative.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mWifiNative.setupForSoftApMode(eq(TEST_INTERFACE_NAME)))
+ .thenReturn(Pair.create(WifiNative.SETUP_SUCCESS, mApInterface));
+
SoftApModeConfiguration softApModeConfig =
new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, mDefaultApConfig);
@@ -341,8 +677,6 @@
mWifiNative,
TEST_COUNTRY_CODE,
mListener,
- mApInterface,
- TEST_INTERFACE_NAME,
mNmService,
mWifiApConfigStore,
softApModeConfig,
@@ -632,6 +966,11 @@
ContentObserver.class);
ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+ when(mWifiNative.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mApInterface.getInterfaceName()).thenReturn(TEST_INTERFACE_NAME);
+ when(mWifiNative.setupForSoftApMode(eq(TEST_INTERFACE_NAME)))
+ .thenReturn(Pair.create(WifiNative.SETUP_SUCCESS, mApInterface));
+
mSoftApManager.start();
mLooper.dispatchAll();
order.verify(mListener).onStateChanged(WifiManager.WIFI_AP_STATE_ENABLING, 0);
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachinePrimeTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachinePrimeTest.java
index f2d6cc6..0c5db44 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachinePrimeTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachinePrimeTest.java
@@ -19,14 +19,12 @@
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.*;
-import android.net.wifi.IApInterface;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.os.INetworkManagementService;
import android.os.test.TestLooper;
import android.test.suitebuilder.annotation.SmallTest;
import android.util.Log;
-import android.util.Pair;
import org.junit.After;
import org.junit.Before;
@@ -56,7 +54,6 @@
@Mock WifiNative mWifiNative;
@Mock WifiApConfigStore mWifiApConfigStore;
TestLooper mLooper;
- @Mock IApInterface mApInterface;
@Mock INetworkManagementService mNMService;
@Mock SoftApManager mSoftApManager;
SoftApManager.Listener mSoftApListener;
@@ -106,24 +103,17 @@
*/
private void enterSoftApActiveMode(SoftApModeConfiguration softApConfig) throws Exception {
String fromState = mWifiStateMachinePrime.getCurrentMode();
- when(mWifiNative.setupForSoftApMode(WIFI_IFACE_NAME))
- .thenReturn(new Pair(WifiNative.SETUP_SUCCESS, mApInterface));
- when(mApInterface.getInterfaceName()).thenReturn(WIFI_IFACE_NAME);
doAnswer(
new Answer<Object>() {
public SoftApManager answer(InvocationOnMock invocation) {
Object[] args = invocation.getArguments();
assertEquals(mNMService, (INetworkManagementService) args[0]);
mSoftApListener = (SoftApManager.Listener) args[1];
- assertEquals(mApInterface, (IApInterface) args[2]);
- assertEquals(WIFI_IFACE_NAME, (String) args[3]);
- assertEquals(softApConfig, (SoftApModeConfiguration) args[4]);
+ assertEquals(softApConfig, (SoftApModeConfiguration) args[2]);
return mSoftApManager;
}
}).when(mWifiInjector).makeSoftApManager(any(INetworkManagementService.class),
any(SoftApManager.Listener.class),
- any(IApInterface.class),
- anyString(),
any());
mWifiStateMachinePrime.enterSoftAPMode(softApConfig);
mLooper.dispatchAll();
@@ -138,7 +128,7 @@
private void verifyCleanupCalled() {
// for now, this is a single call, but make a helper to avoid adding any additional cleanup
// checks
- verify(mWifiNative).tearDown();
+ verify(mWifiNative, atLeastOnce()).tearDown();
}
/**
@@ -195,12 +185,9 @@
*/
@Test
public void testDisableWifiFromSoftApModeState() throws Exception {
- // Use a failure getting the interface to stay in SoftApMode
- when(mWifiNative.setupForSoftApMode(WIFI_IFACE_NAME))
- .thenReturn(new Pair(WifiNative.SETUP_FAILURE_HAL, null));
-
- mWifiStateMachinePrime.enterSoftAPMode(
- new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, null));
+ enterSoftApActiveMode();
+ // now inject failure through the SoftApManager.Listener
+ mSoftApListener.onStateChanged(WifiManager.WIFI_AP_STATE_FAILED, 0);
mLooper.dispatchAll();
assertEquals(SOFT_AP_MODE_STATE_STRING, mWifiStateMachinePrime.getCurrentMode());
@@ -227,34 +214,19 @@
}
/**
- * Test that we do not attempt to enter SoftApModeActiveState when we cannot get an ApInterface
- * from wificond.
- * Expectations: After a failed attempt to get an ApInterface from WifiInjector, we should
- * remain in the SoftApModeState.
- */
- @Test
- public void testAPInterfaceFailedWhenSwitchingToApMode() throws Exception {
- when(mWifiNative.setupForSoftApMode(WIFI_IFACE_NAME))
- .thenReturn(new Pair(WifiNative.SETUP_FAILURE_HAL, null));
- mWifiStateMachinePrime.enterSoftAPMode(
- new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, null));
- mLooper.dispatchAll();
- assertEquals(SOFT_AP_MODE_STATE_STRING, mWifiStateMachinePrime.getCurrentMode());
- }
-
- /**
* Test that we do enter the SoftApModeActiveState if we are already in the SoftApModeState.
* Expectations: We should exit the current SoftApModeState and re-enter before successfully
* entering the SoftApModeActiveState.
*/
@Test
public void testEnterSoftApModeActiveWhenAlreadyInSoftApMode() throws Exception {
- when(mWifiNative.setupForSoftApMode(WIFI_IFACE_NAME))
- .thenReturn(new Pair(WifiNative.SETUP_SUCCESS, null));
- mWifiStateMachinePrime.enterSoftAPMode(
- new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, null));
+ enterSoftApActiveMode();
+ // now inject failure through the SoftApManager.Listener
+ mSoftApListener.onStateChanged(WifiManager.WIFI_AP_STATE_FAILED, 0);
mLooper.dispatchAll();
assertEquals(SOFT_AP_MODE_STATE_STRING, mWifiStateMachinePrime.getCurrentMode());
+ // clear the first call to start SoftApManager
+ reset(mSoftApManager);
enterSoftApActiveMode();
}
@@ -318,57 +290,12 @@
}
/**
- * Test that the proper config is used if a prior attempt fails without using the config.
- * Expectations: A call to start softap with a null config fails, but a second call has a set
- * config - this second call should use the correct config.
- */
- @Test
- public void testNullApModeConfigFails() throws Exception {
- when(mWifiNative.setupForSoftApMode(WIFI_IFACE_NAME))
- .thenReturn(new Pair(WifiNative.SETUP_SUCCESS, null));
- mWifiStateMachinePrime.enterSoftAPMode(
- new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, null));
- mLooper.dispatchAll();
- assertEquals(SOFT_AP_MODE_STATE_STRING, mWifiStateMachinePrime.getCurrentMode());
- WifiConfiguration config = new WifiConfiguration();
- config.SSID = "ThisIsAConfig";
- SoftApModeConfiguration softApConfig =
- new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, config);
- enterSoftApActiveMode(softApConfig);
- }
-
- /**
- * Test that a failed call to start softap with a valid config does not persist the ap
- * configuration to the WifiApConfigStore.
- *
- * Expectations: A call to start SoftAPMode with a config should not write out the config if we
- * did not create a SoftApManager.
- */
- @Test
- public void testValidConfigIsSavedOnFailureToStart() throws Exception {
- when(mWifiNative.setupForSoftApMode(WIFI_IFACE_NAME))
- .thenReturn(new Pair(WifiNative.SETUP_SUCCESS, null));
- when(mWifiInjector.getWifiApConfigStore()).thenReturn(mWifiApConfigStore);
- WifiConfiguration config = new WifiConfiguration();
- config.SSID = "ThisIsAConfig";
- SoftApModeConfiguration softApConfig =
- new SoftApModeConfiguration(WifiManager.IFACE_IP_MODE_TETHERED, config);
- mWifiStateMachinePrime.enterSoftAPMode(softApConfig);
- mLooper.dispatchAll();
- assertEquals(SOFT_AP_MODE_STATE_STRING, mWifiStateMachinePrime.getCurrentMode());
- verify(mWifiApConfigStore, never()).setApConfiguration(eq(config));
- }
-
- /**
* Test that two calls to switch to SoftAPMode in succession ends up with the correct config.
*
* Expectation: we should end up in SoftAPMode state configured with the second config.
*/
@Test
public void testStartSoftApModeTwiceWithTwoConfigs() throws Exception {
- when(mWifiNative.setupForSoftApMode(WIFI_IFACE_NAME))
- .thenReturn(new Pair(WifiNative.SETUP_SUCCESS, mApInterface));
- when(mApInterface.getInterfaceName()).thenReturn(WIFI_IFACE_NAME);
when(mWifiInjector.getWifiApConfigStore()).thenReturn(mWifiApConfigStore);
WifiConfiguration config1 = new WifiConfiguration();
config1.SSID = "ThisIsAConfig";
@@ -381,14 +308,10 @@
when(mWifiInjector.makeSoftApManager(any(INetworkManagementService.class),
any(SoftApManager.Listener.class),
- any(IApInterface.class),
- anyString(),
eq(softApConfig1)))
.thenReturn(mSoftApManager);
when(mWifiInjector.makeSoftApManager(any(INetworkManagementService.class),
any(SoftApManager.Listener.class),
- any(IApInterface.class),
- anyString(),
eq(softApConfig2)))
.thenReturn(mSoftApManager);
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
index 04d5c17..e1e4568 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
@@ -397,7 +397,6 @@
.thenReturn(mWifiConnectivityManager);
when(mWifiInjector.makeSoftApManager(any(INetworkManagementService.class),
mSoftApManagerListenerCaptor.capture(),
- any(IApInterface.class), anyString(),
any(SoftApModeConfiguration.class)))
.thenReturn(mSoftApManager);
when(mWifiInjector.getPasspointManager()).thenReturn(mPasspointManager);
@@ -415,8 +414,6 @@
when(mWifiNative.setupForClientMode(WIFI_IFACE_NAME))
.thenReturn(Pair.create(WifiNative.SETUP_SUCCESS, mClientInterface));
- when(mWifiNative.setupForSoftApMode(WIFI_IFACE_NAME))
- .thenReturn(Pair.create(WifiNative.SETUP_SUCCESS, mApInterface));
when(mApInterface.getInterfaceName()).thenReturn(WIFI_IFACE_NAME);
when(mWifiNative.getInterfaceName()).thenReturn(WIFI_IFACE_NAME);
when(mWifiNative.enableSupplicant()).thenReturn(true);
@@ -573,7 +570,6 @@
assertEquals("SoftApState", getCurrentState().getName());
- verify(mWifiNative).setupForSoftApMode(WIFI_IFACE_NAME);
verify(mSoftApManager).start();
}
@@ -2442,40 +2438,6 @@
}
/**
- * Test that failure to start HAL in AP mode increments the corresponding metrics.
- */
- @Test
- public void testSetupForSoftApModeHalFailureIncrementsMetrics() throws Exception {
- when(mWifiNative.setupForSoftApMode(WIFI_IFACE_NAME))
- .thenReturn(Pair.create(WifiNative.SETUP_FAILURE_HAL, null));
-
- SoftApModeConfiguration config = new SoftApModeConfiguration(
- WifiManager.IFACE_IP_MODE_TETHERED, new WifiConfiguration());
- mWsm.setHostApRunning(config, true);
- mLooper.dispatchAll();
-
- verify(mWifiNative).setupForSoftApMode(WIFI_IFACE_NAME);
- verify(mWifiMetrics).incrementNumWifiOnFailureDueToHal();
- }
-
- /**
- * Test that failure to start HAL in AP mode increments the corresponding metrics.
- */
- @Test
- public void testSetupForSoftApModeWificondFailureIncrementsMetrics() throws Exception {
- when(mWifiNative.setupForSoftApMode(WIFI_IFACE_NAME))
- .thenReturn(Pair.create(WifiNative.SETUP_FAILURE_WIFICOND, null));
-
- SoftApModeConfiguration config = new SoftApModeConfiguration(
- WifiManager.IFACE_IP_MODE_TETHERED, new WifiConfiguration());
- mWsm.setHostApRunning(config, true);
- mLooper.dispatchAll();
-
- verify(mWifiNative).setupForSoftApMode(WIFI_IFACE_NAME);
- verify(mWifiMetrics).incrementNumWifiOnFailureDueToWificond();
- }
-
- /**
* Test that failure to start HAL in client mode increments the corresponding metrics.
*/
@Test