Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

softAp framework changes

Browse Source 
Remove AP persist settings
Add new netd interface
Handle errors
Handle AP config change
Bug: 2413908
Change-Id: I31a1221ef5479da8d4a2620f0f0ee0b62539bc69
This commit is contained in:
Irfan Sheriff
2010-03-12 15:48:17 -08:00
parent 9c041bbd81
commit 9ab518ad79
7 changed files with 168 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
services/java/com/android/server/NetworkManagementService.java
View File

@@ -26,10 +26,13 @@ import android.content.pm.PackageManager;
import android.net.Uri;
import android.net.InterfaceConfiguration;
import android.net.INetworkManagementEventObserver;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiConfiguration.KeyMgmt;
import android.os.INetworkManagementService;
import android.os.Handler;
import android.os.SystemProperties;
import android.text.TextUtils;
import android.util.Log;
import android.util.Slog;
import java.util.ArrayList;
import java.util.StringTokenizer;
@@ -457,14 +460,38 @@ class NetworkManagementService extends INetworkManagementService.Stub {
throw new IllegalStateException("Got an empty response");
}
public void startAccessPoint()
public void startAccessPoint(WifiConfiguration wifiConfig, String intf)
throws IllegalStateException {
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.CHANGE_NETWORK_STATE, "NetworkManagementService");
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.CHANGE_WIFI_STATE, "NetworkManagementService");
mConnector.doCommand(String.format("softap set"));
mConnector.doCommand(String.format("softap start"));
mConnector.doCommand(String.format("softap stop " + intf));
mConnector.doCommand(String.format("softap fwreload " + intf + " AP"));
mConnector.doCommand(String.format("softap start " + intf));
if (wifiConfig == null) {
mConnector.doCommand(String.format("softap set " + intf + " wl0.1"));
} else {
/**
* softap set arg1 arg2 arg3 [arg4 arg5 arg6 arg7 arg8]
* argv1 - wlan interface
* argv2 - softap interface
* argv3 - SSID
* argv4 - Security
* argv5 - Key
* argv6 - Channel
* argv7 - Preamble
* argv8 - Max SCB
*
* TODO: get a configurable softap interface from driver
*/
String str = String.format("softap set " + intf + " wl0.1 %s %s %s", wifiConfig.SSID,
wifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ?
"wpa2-psk" : "open",
wifiConfig.preSharedKey);
mConnector.doCommand(str);
}
mConnector.doCommand(String.format("softap startap"));
}
public void stopAccessPoint() throws IllegalStateException {
@@ -472,7 +499,7 @@ class NetworkManagementService extends INetworkManagementService.Stub {
android.Manifest.permission.CHANGE_NETWORK_STATE, "NetworkManagementService");
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.CHANGE_WIFI_STATE, "NetworkManagementService");
mConnector.doCommand("softap stop");
mConnector.doCommand("softap stopap");
}
}