summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichaël Burtin <bukington@gmail.com>2012-01-30 22:17:03 +0100
committerMichaël Burtin <bukington@gmail.com>2012-02-03 20:42:24 +0100
commit3fd5168f164fd2b887960eb751457a50b0ac850a (patch)
tree210df1e7b0f2d7563a42d84bc35f25aafb5fce7f
parente3a56d8ea7bea2c9e6127e835880cd49de514751 (diff)
downloadframeworks_base-3fd5168f164fd2b887960eb751457a50b0ac850a.zip
frameworks_base-3fd5168f164fd2b887960eb751457a50b0ac850a.tar.gz
frameworks_base-3fd5168f164fd2b887960eb751457a50b0ac850a.tar.bz2
Get SoftAP interface from wifi.ap.interface prop
Change-Id: I27ca6abd1abd82be859829c9a0dce93687e57268
-rw-r--r--wifi/java/android/net/wifi/WifiStateMachine.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index 82abe3a..67181c9 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -110,7 +110,7 @@ public class WifiStateMachine extends StateMachine {
private static final boolean DBG = false;
/* TODO: This is no more used with the hostapd code. Clean up */
- private static final String SOFTAP_IFACE = "wl0.1";
+ private String mSoftApIface;
private WifiMonitor mWifiMonitor;
private INetworkManagementService mNwService;
@@ -583,6 +583,8 @@ public class WifiStateMachine extends StateMachine {
mDefaultSupplicantScanIntervalMs = mContext.getResources().getInteger(
com.android.internal.R.integer.config_wifi_supplicant_scan_interval);
+ mSoftApIface = SystemProperties.get("wifi.ap.interface", "wl0.1");
+
mContext.registerReceiver(
new BroadcastReceiver() {
@Override
@@ -1768,12 +1770,12 @@ public class WifiStateMachine extends StateMachine {
new Thread(new Runnable() {
public void run() {
try {
- mNwService.startAccessPoint(config, mInterfaceName, SOFTAP_IFACE);
+ mNwService.startAccessPoint(config, mInterfaceName, mSoftApIface);
} catch (Exception e) {
loge("Exception in softap start " + e);
try {
mNwService.stopAccessPoint(mInterfaceName);
- mNwService.startAccessPoint(config, mInterfaceName, SOFTAP_IFACE);
+ mNwService.startAccessPoint(config, mInterfaceName, mSoftApIface);
} catch (Exception e1) {
loge("Exception in softap re-start " + e1);
sendMessage(CMD_START_AP_FAILURE);